More Linux Kernel Detections

src/mark.h

@@ -1,6 +1,42 @@
 #ifndef MARK_H
 #define MARK_H
 
+#include <linux/version.h>
+
+//original inclusions
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 7, 0)
+#if 0
+  #include "libiptc/libiptc.h"
+ #include <linux/netfilter_ipv4/ip_conntrack.h>
+ #include <linux/netfilter_ipv4/ip_conntrack_tuple.h>
+ #include "libiptc/ipt_conntrack.h"
+ #include "libiptc/ipt_connmark.h"
+ #include "libiptc/ipt_CONNMARK.h"
+ #endif
+
+ #if 1
+ #include "libiptc/libiptc.h"
+ #if 1
+  #include <linux/netfilter/nf_conntrack_common.h>
+ #endif
+ #if 0
+ #include <linux/netfilter_ipv4/ipt_conntrack_tuple.h>
+ #endif
+#include "libiptc/ipt_conntrack.h"
+#include "libiptc/ipt_connmark.h"
+#include "libiptc/ipt_CONNMARK.h"
+ #endif
+
+ /* 2010 fixes for debian package */
+ #if 0
+ #include "libiptc/libiptc.h"
+ #include <linux/netfilter/nf_conntrack_common.h>
+ #include <linux/netfilter_ipv4/ipt_conntrack.h>
+ #include <linux/netfilter_ipv4/ipt_connmark.h>
+ #include <linux/netfilter_ipv4/ipt_CONNMARK.h>
+ #endif
+#endif
+
 #include "libiptc/libiptc.h"
 #include <linux/netfilter/nf_conntrack_common.h>
 #include "libiptc/ipt_conntrack.h"
@@ -32,13 +68,13 @@
 #define MATCH_SZ		IPT_ENTRY_MATCH_SZ+IPT_CT_INFO_SZ
 #define TARGET_SZ		IPT_ENTRY_TARGET_SZ+IPT_CM_TARGET_INFO_SZ
 
-#define RESTORE_OUTPUT_RULE_SZ	IPT_ENTRY_SZ+MATCH_SZ+TARGET_SZ	
+#define RESTORE_OUTPUT_RULE_SZ	IPT_ENTRY_SZ+MATCH_SZ+TARGET_SZ
 
 #define OFFSET_MATCH		IPT_ENTRY_SZ
 #define OFFSET_MATCH_INFO	OFFSET_MATCH+IPT_ENTRY_MATCH_SZ
 #define OFFSET_TARGET		OFFSET_MATCH_INFO+IPT_CT_INFO_SZ
 #define OFFSET_TARGET_INFO	OFFSET_TARGET+IPT_ENTRY_TARGET_SZ
-		
+
 #define MARK_RULE_SZ		IPT_ENTRY_SZ+TARGET_SZ
 #define MAX_MARK_RULES		100