File novell-nortelplugins-support_ipsec.patch of Package novell-nortelplugins

Index: novell-nortelplugins-0.1.3/nortel/ike/packets.c
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/packets.c
+++ novell-nortelplugins-0.1.3/nortel/ike/packets.c
@@ -8,7 +8,6 @@
 #include <netinet/in.h>
 
 #include "net/pfkeyv2.h"
-#include "netinet/ipsec.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,6 +28,8 @@
 #include "utility.h"
 #include "packets.h"
 
+#define PATH_IPSEC_H <netinet/ipsec.h>
+
 /* Racoon Headers */
 #include "racoon/vmbuf.h"
 #include "racoon/isakmp_var.h"
Index: novell-nortelplugins-0.1.3/nortel/ike/nortel_cfg.c
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/nortel_cfg.c
+++ novell-nortelplugins-0.1.3/nortel/ike/nortel_cfg.c
@@ -6,6 +6,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#define PATH_IPSEC_H <netinet/ipsec.h>
+
 #include <libipsec/libpfkey.h>
 #include <racoon/admin.h>
 
@@ -17,7 +19,7 @@
 #include "utility.h"
 
 #include "racoon/handler.h"
-#include "turnpike/common.h"
+#include "plugin_frame/common.h"
 #include "racoon/isakmp.h"
 #include "racoon/nattraversal.h"
 
Index: novell-nortelplugins-0.1.3/nortel/ike/nortel_nat.c
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/nortel_nat.c
+++ novell-nortelplugins-0.1.3/nortel/ike/nortel_nat.c
@@ -6,6 +6,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#define PATH_IPSEC_H <netinet/ipsec.h>
 #include <libipsec/libpfkey.h>
 #include <racoon/admin.h>
 #include <racoon/schedule.h>
@@ -17,6 +18,8 @@
 #include "callbacks.h"
 #include "utility.h"
 
+#define ENABLE_NATT
+
 #include "racoon/handler.h"
 #include "racoon/isakmp.h"
 #include "racoon/nattraversal.h"
Index: novell-nortelplugins-0.1.3/nortel/ike/nortel_inf.c
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/nortel_inf.c
+++ novell-nortelplugins-0.1.3/nortel/ike/nortel_inf.c
@@ -6,6 +6,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#define PATH_IPSEC_H <netinet/ipsec.h>
+
 #include <libipsec/libpfkey.h>
 #include <racoon/admin.h>
 
Index: novell-nortelplugins-0.1.3/nortel/common/plog.h
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/common/plog.h
+++ novell-nortelplugins-0.1.3/nortel/common/plog.h
@@ -62,7 +62,14 @@ extern int f_foreground;
 extern int print_location;
 
 struct sockaddr;
-extern void plog __P((int, const char *, struct sockaddr *, const char *, ...))
+
+#define plog(pri, ...) \
+	do { \
+		if ((pri) <= loglevel) \
+		_plog((pri), __VA_ARGS__); \
+	} while (0)
+
+extern void _plog __P((int, const char *, struct sockaddr *, const char *, ...))
 	__attribute__ ((__format__ (__printf__, 4, 5)));
 extern void plogv __P((int, const char *, struct sockaddr *,
 	const char *, va_list));
Index: novell-nortelplugins-0.1.3/nortel/ike/registerpayload.h
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/registerpayload.h
+++ novell-nortelplugins-0.1.3/nortel/ike/registerpayload.h
@@ -2,8 +2,8 @@
 #define __REGISTERPAYLOAD_H__
 
 /* Framework headers */
-#include "turnpike/common.h"
-#include "turnpike/position.h"
+#include "plugin_frame/common.h"
+#include "plugin_frame/position.h"
     
 #if 0
 int constructHookPoint(struct hookpoint *hook, u_int8_t type, u_int8_t AttrOrPayloadType, u_int8_t AttrOrPayloadSubType, u_int32_t position, u_int8_t mandatoryOrOptional, u_int32_t keylen, void *KEY);
Index: novell-nortelplugins-0.1.3/nortel/ike/registerpayload.c
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/registerpayload.c
+++ novell-nortelplugins-0.1.3/nortel/ike/registerpayload.c
@@ -18,10 +18,6 @@
 #include "racoon/isakmp.h"
 #include "racoon/ipsec_doi.h"
 
-/* Framework headers */
-#include "turnpike/common.h"
-#include "turnpike/position.h"
-
 #include <linux/pfkeyv2.h>
 
 #if 0
Index: novell-nortelplugins-0.1.3/nortel/ike/registerattr.c
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/registerattr.c
+++ novell-nortelplugins-0.1.3/nortel/ike/registerattr.c
@@ -16,10 +16,6 @@
 #include "racoon/isakmp_var.h"
 #include "racoon/isakmp.h"
 
-/* Framework headers */
-#include "turnpike/common.h"
-#include "turnpike/position.h"
-
 // IKE Attribute CES Client Version
 
 int registerCESClientVerCallback()
Index: novell-nortelplugins-0.1.3/nortel/ike/registerattr.h
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/registerattr.h
+++ novell-nortelplugins-0.1.3/nortel/ike/registerattr.h
@@ -3,8 +3,8 @@
 
 #include "nortel_inf.h"
 /* Framework headers */
-#include "turnpike/common.h"
-#include "turnpike/position.h"
+#include "plugin_frame/common.h"
+#include "plugin_frame/position.h"
 
 int registerCESClientVerCallback();
 int registerCfgAttrReqCallback(u_int16_t key, CALLBACK callback);
Index: novell-nortelplugins-0.1.3/nortel/ike/fwinterface.c
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/fwinterface.c
+++ novell-nortelplugins-0.1.3/nortel/ike/fwinterface.c
@@ -15,9 +15,7 @@
 #include "racoon/isakmp.h"
 
 /* Framework headers */
-#include "turnpike/common.h"
-#include "turnpike/position.h"
-#include "turnpike/error.h"
+#include "plugin_frame/error.h"
 
 #include "registerpayload.h"
 #include "registerattr.h"
Index: novell-nortelplugins-0.1.3/nortel/ike/callbacks.c
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/callbacks.c
+++ novell-nortelplugins-0.1.3/nortel/ike/callbacks.c
@@ -20,7 +20,7 @@
 #include "racoon/admin.h"
 
 /* Framework headers */
-#include "turnpike/common.h"
+#include "plugin_frame/common.h"
 
 #include "callbacks.h"
 #include "packets.h"
Index: novell-nortelplugins-0.1.3/nortel/ike/payloadcheck.c
===================================================================
--- novell-nortelplugins-0.1.3.orig/nortel/ike/payloadcheck.c
+++ novell-nortelplugins-0.1.3/nortel/ike/payloadcheck.c
@@ -13,7 +13,7 @@
 #include "racoon/isakmp.h"
 #include "racoon/nattraversal.h"
 
-#include "turnpike/common.h"
+#include "plugin_frame/common.h"
 
 int NATDetected = 0;