ipif: move #include of automech.h down so that it has definition of struct mechanism

[userv-utils.git] / ipif / forwarder.h

diff --git a/ipif/forwarder.h b/ipif/forwarder.h
index 08eee56ed4c96276942bd9b0a557172760cd71a2..599eb41a0e6bc521e5f818d333f7915f68ab2ed5 100644 (file)
--- a/ipif/forwarder.h
+++ b/ipif/forwarder.h
@@ -1,4 +1,23 @@
 /*
 /*

+ * Encrypting tunnel for userv-ipif tunnels, header file
+ */
+/*
+ * Copyright (C) 2000,2003 Ian Jackson
+ * This file is part of ipif, part of userv-utils
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with userv-utils; if not, write to the Free Software
+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

  */
 
 #ifndef MECHS_H
  */
 
 #ifndef MECHS_H


@@ -6,10 +25,9 @@
 
 #include <stdio.h>
 #include <time.h>
 
 #include <stdio.h>
 #include <time.h>

+#include <string.h>

 #include <sys/utsname.h>
 
 #include <sys/utsname.h>
 

-#include "automech.h"
-

 struct buffer {
   unsigned char *base;
   unsigned char *start;
 struct buffer {
   unsigned char *base;
   unsigned char *start;


@@ -32,6 +50,8 @@ struct mechanism {
   mdec_functype *decode;
 };
 
   mdec_functype *decode;
 };
 

+#include "automech.h"
+

 extern const struct mechanism *const mechanismlists[];
 
 /* setup function may call getarg_xxx functions and then
 extern const struct mechanism *const mechanismlists[];
 
 /* setup function may call getarg_xxx functions and then


@@ -39,7 +59,8 @@ extern const struct mechanism *const mechanismlists[];
  * 
  * setup_in function may increase maxprefix and maxsuffix
  * code functions modify buffer in place
  * 
  * setup_in function may increase maxprefix and maxsuffix
  * code functions modify buffer in place

- * decode function returns message to print
+ * decode function returns 0 meaning packet decoded ok,
+ *  "" meaning discard it quietly, or message to print for verbose discard

  */
   
 const char *getarg_string(void);
  */
   
 const char *getarg_string(void);