[netfilter-cvslog] r6639 - trunk/iptables/libiptc

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2006-07-05 11:31:45 +0200 (Wed, 05 Jul 2006)
New Revision: 6639

Modified:
   trunk/iptables/libiptc/libip4tc.c
   trunk/iptables/libiptc/libip6tc.c
Log:
[PATCH] libiptc symbols clash (Phil Oester <kernel at linuxace.com>)

As reported by Dmitry Levin, the TC_NUM_RULES and TC_GET_RULE exports
clash.  His patch below, resolving bug #456


Modified: trunk/iptables/libiptc/libip4tc.c
===================================================================
--- trunk/iptables/libiptc/libip4tc.c	2006-07-04 10:23:26 UTC (rev 6638)
+++ trunk/iptables/libiptc/libip4tc.c	2006-07-05 09:31:45 UTC (rev 6639)
@@ -94,6 +94,8 @@
 #define TC_FREE			iptc_free
 #define TC_COMMIT		iptc_commit
 #define TC_STRERROR		iptc_strerror
+#define TC_NUM_RULES		iptc_num_rules
+#define TC_GET_RULE		iptc_get_rule
 
 #define TC_AF			AF_INET
 #define TC_IPPROTO		IPPROTO_IP

Modified: trunk/iptables/libiptc/libip6tc.c
===================================================================
--- trunk/iptables/libiptc/libip6tc.c	2006-07-04 10:23:26 UTC (rev 6638)
+++ trunk/iptables/libiptc/libip6tc.c	2006-07-05 09:31:45 UTC (rev 6639)
@@ -89,6 +89,8 @@
 #define TC_FREE			ip6tc_free
 #define TC_COMMIT		ip6tc_commit
 #define TC_STRERROR		ip6tc_strerror
+#define TC_NUM_RULES		ip6tc_num_rules
+#define TC_GET_RULE		ip6tc_get_rule
 
 #define TC_AF			AF_INET6
 #define TC_IPPROTO		IPPROTO_IPV6