summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYasuyuki KOZAKAI <yasuyuki@netfilter.org>2006-04-15 03:05:41 +0000
committerYasuyuki KOZAKAI <yasuyuki@netfilter.org>2006-04-15 03:05:41 +0000
commit1f312c2e3ee57eadde7c8bfc12d838aa0f60e99e (patch)
treeed961579a804adcfda83945ae0acaf4096c58e2c
parent708e0580573acd24065ad052c096c5020c16dee2 (diff)
fix loading shared library of ICMPv6 match.
The current ip6tables tries to load libip6t_icmp6.so when user types 'ip6tables -p icmpv6 ...' or 'ip6tables ... -m icmpv6' ...', and it fails. This patch renames libip6t_icmpv6.c to libip6t_icmp6.c so that ip6tables can load it. Now kernel module and user library has same name 'icmp6'. It can reduce confusion about name mismatch. That's why I renamed it instead of reverting change in find_match() which brought this bug. This patch keeps compatibiity and we can use '-p icmpv6', '-p ipv6-icmpv6', '-m icmpv6', '-m ipv6-icmpv6', and '-m icmp6', as ever.
-rw-r--r--extensions/Makefile2
-rw-r--r--extensions/libip6t_icmp6.c (renamed from extensions/libip6t_icmpv6.c)0
-rw-r--r--extensions/libip6t_icmp6.man (renamed from extensions/libip6t_icmpv6.man)0
3 files changed, 1 insertions, 1 deletions
diff --git a/extensions/Makefile b/extensions/Makefile
index 7164e1d2..af051f85 100644
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -6,7 +6,7 @@
# package (HW)
#
PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac mark multiport owner physdev pkttype policy realm rpc sctp standard state tcp tcpmss tos ttl udp unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT SAME SNAT TARPIT TCPMSS TOS TRACE TTL ULOG
-PF6_EXT_SLIB:=connmark eui64 hl icmpv6 length limit mac mark multiport owner physdev policy standard state tcp udp CONNMARK HL LOG NFQUEUE MARK TRACE
+PF6_EXT_SLIB:=connmark eui64 hl icmp6 length limit mac mark multiport owner physdev policy standard state tcp udp CONNMARK HL LOG NFQUEUE MARK TRACE
# Optionals
PF_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
diff --git a/extensions/libip6t_icmpv6.c b/extensions/libip6t_icmp6.c
index a29bb389..a29bb389 100644
--- a/extensions/libip6t_icmpv6.c
+++ b/extensions/libip6t_icmp6.c
diff --git a/extensions/libip6t_icmpv6.man b/extensions/libip6t_icmp6.man
index 20471804..20471804 100644
--- a/extensions/libip6t_icmpv6.man
+++ b/extensions/libip6t_icmp6.man