libiptc symbols clash (Phil Oester <kernel@linuxace.com>)

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

diff --git a/libiptc/libip4tc.c b/libiptc/libip4tc.c
index 2e8647cdc9551a433e243a54c423ad06b8aa3079..a0cdc2f8ecc7b81a25ac04efb443f3bbdc36dd3d 100644 (file)
--- a/libiptc/libip4tc.c
+++ b/libiptc/libip4tc.c
@@ -94,6 +94,8 @@ typedef unsigned int socklen_t;
 #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

diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c
index 8ca5ea66c64d1536b2cdfa65d5f50f51c23531b5..5b3ae0bf6deb0178362087d483db23ce460a856e 100644 (file)
--- a/libiptc/libip6tc.c
+++ b/libiptc/libip6tc.c
@@ -89,6 +89,8 @@ typedef unsigned int socklen_t;
 #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