[svn-upgrade] Integrating new upstream version, strongswan (4.1.3)

1 files changed, 1 insertions, 138 deletions

diff --git a/src/libfreeswan/ipsec_tunnel.h b/src/libfreeswan/ipsec_tunnel.h
index 3b25e95e1..672755946 100644
--- a/src/libfreeswan/ipsec_tunnel.h
+++ b/src/libfreeswan/ipsec_tunnel.h
@@ -16,6 +16,7 @@
  * RCSID $Id: ipsec_tunnel.h,v 1.1 2004/03/15 20:35:25 as Exp $
  */
 
+#include <linux/types.h>
 
 #ifdef NET_21
 # define DEV_QUEUE_XMIT(skb, device, pri) {\
@@ -125,141 +126,3 @@ extern int sysctl_ipsec_debug_verbose;
 #define DB_TN_OXFS	0x0080
 #define DB_TN_REVEC	0x0100
 #endif /* CONFIG_IPSEC_DEBUG */
-
-/*
- * $Log: ipsec_tunnel.h,v $
- * Revision 1.1  2004/03/15 20:35:25  as
- * added files from freeswan-2.04-x509-1.5.3
- *
- * Revision 1.28  2003/06/24 20:22:32  mcr
- * 	added new global: ipsecdevices[] so that we can keep track of
- * 	the ipsecX devices. They will be referenced with dev_hold(),
- * 	so 2.2 may need this as well.
- *
- * Revision 1.27  2003/04/03 17:38:09  rgb
- * Centralised ipsec_kfree_skb and ipsec_dev_{get,put}.
- *
- * Revision 1.26  2003/02/12 19:32:20  rgb
- * Updated copyright year.
- *
- * Revision 1.25  2002/05/27 18:56:07  rgb
- * Convert to dynamic ipsec device allocation.
- *
- * Revision 1.24  2002/04/24 07:36:48  mcr
- * Moved from ./klips/net/ipsec/ipsec_tunnel.h,v
- *
- * Revision 1.23  2001/11/06 19:50:44  rgb
- * Moved IP_SEND, ICMP_SEND, DEV_QUEUE_XMIT macros to ipsec_tunnel.h for
- * use also by pfkey_v2_parser.c
- *
- * Revision 1.22  2001/09/15 16:24:05  rgb
- * Re-inject first and last HOLD packet when an eroute REPLACE is done.
- *
- * Revision 1.21  2001/06/14 19:35:10  rgb
- * Update copyright date.
- *
- * Revision 1.20  2000/09/15 11:37:02  rgb
- * Merge in heavily modified Svenning Soerensen's <svenning@post5.tele.dk>
- * IPCOMP zlib deflate code.
- *
- * Revision 1.19  2000/09/08 19:12:56  rgb
- * Change references from DEBUG_IPSEC to CONFIG_IPSEC_DEBUG.
- *
- * Revision 1.18  2000/07/28 13:50:54  rgb
- * Changed enet_statistics to net_device_stats and added back compatibility
- * for pre-2.1.19.
- *
- * Revision 1.17  1999/11/19 01:12:15  rgb
- * Purge unneeded proc_info prototypes, now that static linking uses
- * dynamic proc_info registration.
- *
- * Revision 1.16  1999/11/18 18:51:00  rgb
- * Changed all device registrations for static linking to
- * dynamic to reduce the number and size of patches.
- *
- * Revision 1.15  1999/11/18 04:14:21  rgb
- * Replaced all kernel version macros to shorter, readable form.
- * Added CONFIG_PROC_FS compiler directives in case it is shut off.
- * Added Marc Boucher's 2.3.25 proc patches.
- *
- * Revision 1.14  1999/05/25 02:50:10  rgb
- * Fix kernel version macros for 2.0.x static linking.
- *
- * Revision 1.13  1999/05/25 02:41:06  rgb
- * Add ipsec_klipsdebug support for static linking.
- *
- * Revision 1.12  1999/05/05 22:02:32  rgb
- * Add a quick and dirty port to 2.2 kernels by Marc Boucher <marc@mbsi.ca>.
- *
- * Revision 1.11  1999/04/29 15:19:50  rgb
- * Add return values to init and cleanup functions.
- *
- * Revision 1.10  1999/04/16 16:02:39  rgb
- * Bump up macro to 4 ipsec I/Fs.
- *
- * Revision 1.9  1999/04/15 15:37:25  rgb
- * Forward check changes from POST1_00 branch.
- *
- * Revision 1.5.2.1  1999/04/02 04:26:14  rgb
- * Backcheck from HEAD, pre1.0.
- *
- * Revision 1.8  1999/04/11 00:29:01  henry
- * GPL boilerplate
- *
- * Revision 1.7  1999/04/06 04:54:28  rgb
- * Fix/Add RCSID Id: and Log: bits to make PHMDs happy.  This includes
- * patch shell fixes.
- *
- * Revision 1.6  1999/03/31 05:44:48  rgb
- * Keep PMTU reduction private.
- *
- * Revision 1.5  1999/02/10 22:31:20  rgb
- * Change rebuild_header member to reflect generality of link layer.
- *
- * Revision 1.4  1998/12/01 13:22:04  rgb
- * Added support for debug printing of version info.
- *
- * Revision 1.3  1998/07/29 20:42:46  rgb
- * Add a macro for clearing all tunnel devices.
- * Rearrange structures and declarations for sharing with userspace.
- *
- * Revision 1.2  1998/06/25 20:01:45  rgb
- * Make prototypes available for ipsec_init and ipsec proc_dir_entries
- * for static linking.
- *
- * Revision 1.1  1998/06/18 21:27:50  henry
- * move sources from klips/src to klips/net/ipsec, to keep stupid
- * kernel-build scripts happier in the presence of symlinks
- *
- * Revision 1.3  1998/05/18 21:51:50  rgb
- * Added macros for num of I/F's and a procfs debug switch.
- *
- * Revision 1.2  1998/04/21 21:29:09  rgb
- * Rearrange debug switches to change on the fly debug output from user
- * space.  Only kernel changes checked in at this time.  radij.c was also
- * changed to temporarily remove buggy debugging code in rj_delete causing
- * an OOPS and hence, netlink device open errors.
- *
- * Revision 1.1  1998/04/09 03:06:13  henry
- * sources moved up from linux/net/ipsec
- *
- * Revision 1.1.1.1  1998/04/08 05:35:05  henry
- * RGB's ipsec-0.8pre2.tar.gz ipsec-0.8
- *
- * Revision 0.5  1997/06/03 04:24:48  ji
- * Added transport mode.
- * Changed the way routing is done.
- * Lots of bug fixes.
- *
- * Revision 0.4  1997/01/15 01:28:15  ji
- * No changes.
- *
- * Revision 0.3  1996/11/20 14:39:04  ji
- * Minor cleanups.
- * Rationalized debugging code.
- *
- * Revision 0.2  1996/11/02 00:18:33  ji
- * First limited release.
- *
- *
- */