[netfilter-cvslog] r6922 - trunk/iptables/include

[yasuyuki at netfilter.org]

Author: yasuyuki at netfilter.org
Date: 2007-07-24 07:55:12 +0200 (Tue, 24 Jul 2007)
New Revision: 6922

Modified:
   trunk/iptables/include/ip6tables.h
   trunk/iptables/include/iptables.h
   trunk/iptables/include/xtables.h
Log:
Moves IPPROTO_* and IP[6]T_LIB_DIR definitions to xtables.h



Modified: trunk/iptables/include/ip6tables.h
===================================================================
--- trunk/iptables/include/ip6tables.h	2007-07-24 05:53:48 UTC (rev 6921)
+++ trunk/iptables/include/ip6tables.h	2007-07-24 05:55:12 UTC (rev 6922)
@@ -7,19 +7,9 @@
 #include "libiptc/libip6tc.h"
 
 #ifndef IP6T_LIB_DIR
-#define IP6T_LIB_DIR "/usr/local/lib/iptables"
+#define IP6T_LIB_DIR XT_LIB_DIR
 #endif
 
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132
-#endif
-#ifndef IPPROTO_DCCP
-#define IPPROTO_DCCP 33
-#endif
-#ifndef IPPROTO_UDPLITE
-#define IPPROTO_UDPLITE 136
-#endif
-
 #ifndef IP6T_SO_GET_REVISION_MATCH /* Old kernel source. */
 #define IP6T_SO_GET_REVISION_MATCH	68
 #define IP6T_SO_GET_REVISION_TARGET	69

Modified: trunk/iptables/include/iptables.h
===================================================================
--- trunk/iptables/include/iptables.h	2007-07-24 05:53:48 UTC (rev 6921)
+++ trunk/iptables/include/iptables.h	2007-07-24 05:55:12 UTC (rev 6922)
@@ -6,19 +6,9 @@
 #include "libiptc/libiptc.h"
 
 #ifndef IPT_LIB_DIR
-#define IPT_LIB_DIR "/usr/local/lib/iptables"
+#define IPT_LIB_DIR XT_LIB_DIR
 #endif
 
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132
-#endif
-#ifndef IPPROTO_DCCP
-#define IPPROTO_DCCP 33
-#endif
-#ifndef IPPROTO_UDPLITE
-#define IPPROTO_UDPLITE	136
-#endif
-
 #ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */
 #define IPT_SO_GET_REVISION_MATCH	(IPT_BASE_CTL + 2)
 #define IPT_SO_GET_REVISION_TARGET	(IPT_BASE_CTL + 3)

Modified: trunk/iptables/include/xtables.h
===================================================================
--- trunk/iptables/include/xtables.h	2007-07-24 05:53:48 UTC (rev 6921)
+++ trunk/iptables/include/xtables.h	2007-07-24 05:55:12 UTC (rev 6922)
@@ -5,6 +5,20 @@
 #include <linux/netfilter/x_tables.h>
 #include <libiptc/libxtc.h>
 
+#ifndef XT_LIB_DIR
+#define XT_LIB_DIR "/usr/local/lib/iptables"
+#endif
+
+#ifndef IPPROTO_SCTP
+#define IPPROTO_SCTP 132
+#endif
+#ifndef IPPROTO_DCCP
+#define IPPROTO_DCCP 33
+#endif
+#ifndef IPPROTO_UDPLITE
+#define IPPROTO_UDPLITE	136
+#endif
+
 /* protocol family dependent informations */
 struct afinfo {
 	/* protocol family */