[PATCH] libiptc symbols clash

[PATCH] libiptc symbols clash

[Phil Oester]

[-- Attachment #1: Type: text/plain, Size: 122 bytes --]

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

Phil



[-- Attachment #2: patch-libiptc-rules --]
[-- Type: text/plain, Size: 902 bytes --]

diff -ru ipt-orig/libiptc/libip4tc.c ipt-new/libiptc/libip4tc.c
--- ipt-orig/libiptc/libip4tc.c	2005-06-23 01:51:18.000000000 -0700
+++ ipt-new/libiptc/libip4tc.c	2006-06-30 14:05:11.000000000 -0700
@@ -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
diff -ru ipt-orig/libiptc/libip6tc.c ipt-new/libiptc/libip6tc.c
--- ipt-orig/libiptc/libip6tc.c	2005-06-23 01:51:18.000000000 -0700
+++ ipt-new/libiptc/libip6tc.c	2006-06-30 14:05:30.000000000 -0700
@@ -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

Re: [PATCH] libiptc symbols clash

[Patrick McHardy]

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

What does clash mean in this context? They both end up in different
binaries, so I think I might be misunderstanding you.

Re: [PATCH] libiptc symbols clash

[Phil Oester]

On Mon, Jul 03, 2006 at 07:57:09PM +0200, Patrick McHardy wrote:
> Phil Oester wrote:
> > As reported by Dmitry Levin, the TC_NUM_RULES and TC_GET_RULE exports
> > clash.  His patch below, resolving bug #456
> 
> What does clash mean in this context? They both end up in different
> binaries, so I think I might be misunderstanding you.

They end up in libiptc.a twice:

# readelf -s libiptc.a | grep TC
    56: 00000b70    81 FUNC    GLOBAL DEFAULT    1 TC_GET_RULE
    57: 00000bd0    56 FUNC    GLOBAL DEFAULT    1 TC_NUM_RULES
    57: 00000c10    81 FUNC    GLOBAL DEFAULT    1 TC_GET_RULE
    58: 00000c70    56 FUNC    GLOBAL DEFAULT    1 TC_NUM_RULES

instead of with the standard iptc_ and ip6tc_ naming.

Phil

Re: [PATCH] libiptc symbols clash

[Patrick McHardy]

Phil Oester wrote:
> On Mon, Jul 03, 2006 at 07:57:09PM +0200, Patrick McHardy wrote:
> 
>>Phil Oester wrote:
>>
>>>As reported by Dmitry Levin, the TC_NUM_RULES and TC_GET_RULE exports
>>>clash.  His patch below, resolving bug #456
>>
>>What does clash mean in this context? They both end up in different
>>binaries, so I think I might be misunderstanding you.
> 
> 
> They end up in libiptc.a twice:
> 
> # readelf -s libiptc.a | grep TC
>     56: 00000b70    81 FUNC    GLOBAL DEFAULT    1 TC_GET_RULE
>     57: 00000bd0    56 FUNC    GLOBAL DEFAULT    1 TC_NUM_RULES
>     57: 00000c10    81 FUNC    GLOBAL DEFAULT    1 TC_GET_RULE
>     58: 00000c70    56 FUNC    GLOBAL DEFAULT    1 TC_NUM_RULES
> 
> instead of with the standard iptc_ and ip6tc_ naming.

I wonder why nothing seems to complain about this.
Applied, thanks.