X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=ipif%2Fforwarder.h;h=5397317cb76e1653d7b946d0371872bd52030df4;hb=03e3cd7d0224293624a17af7de6638cdd8659917;hp=a9b88b643c3d4102e98715e53cd3d75c490e9e65;hpb=f0e54a9987423f0f5939b961fa10ab4ca7a2c406;p=userv-utils.git

diff --git a/ipif/forwarder.h b/ipif/forwarder.h
index a9b88b6..5397317 100644
--- a/ipif/forwarder.h
+++ b/ipif/forwarder.h
@@ -2,11 +2,17 @@
  * Encrypting tunnel for userv-ipif tunnels, header file
  */
 /*
- * Copyright (C) 2000 Ian Jackson
+ * This file is part of ipif, part of userv-utils
+ *
+ * Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+ * Copyright 1999,2003
+ *    Chancellor Masters and Scholars of the University of Cambridge
+ * Copyright 2010 Tony Finch <fanf@dotat.at>
  *
  * 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
@@ -15,8 +21,7 @@
  * 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.
+ * along with userv-utils; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef MECHS_H
@@ -24,10 +29,9 @@
 
 #include <stdio.h>
 #include <time.h>
+#include <string.h>
 #include <sys/utsname.h>
 
-#include "automech.h"
-
 struct buffer {
   unsigned char *base;
   unsigned char *start;
@@ -50,6 +54,8 @@ struct mechanism {
   mdec_functype *decode;
 };
 
+#include "automech.h"
+
 extern const struct mechanism *const mechanismlists[];
 
 /* setup function may call getarg_xxx functions and then