From 6cd49745931f42cfe2280bf78e483035c3c5e2e6 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net" Date: Tue, 15 Apr 2008 12:01:06 +0000 Subject: [PATCH 08/10] Remove old functions, constants --- extensions/libip6t_icmp6.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'extensions/libip6t_icmp6.c') diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c index 8c9653f..caecc4f 100644 --- a/extensions/libip6t_icmp6.c +++ b/extensions/libip6t_icmp6.c @@ -77,10 +77,9 @@ print_icmpv6types(void) static void icmp6_help(void) { printf( -"ICMPv6 v%s options:\n" +"icmpv6 match options:\n" " --icmpv6-type [!] typename match icmpv6 type\n" -" (or numeric type or type/code)\n" -"\n", IPTABLES_VERSION); +" (or numeric type or type/code)\n"); print_icmpv6types(); } @@ -251,11 +250,12 @@ static void icmp6_check(unsigned int flags) "icmpv6 match: You must specify `--icmpv6-type'"); } -static struct ip6tables_match icmp6_match6 = { +static struct xtables_match icmp6_mt6_reg = { .name = "icmp6", - .version = IPTABLES_VERSION, - .size = IP6T_ALIGN(sizeof(struct ip6t_icmp)), - .userspacesize = IP6T_ALIGN(sizeof(struct ip6t_icmp)), + .version = XTABLES_VERSION, + .family = PF_INET6, + .size = XT_ALIGN(sizeof(struct ip6t_icmp)), + .userspacesize = XT_ALIGN(sizeof(struct ip6t_icmp)), .help = icmp6_help, .init = icmp6_init, .parse = icmp6_parse, @@ -267,5 +267,5 @@ static struct ip6tables_match icmp6_match6 = { void _init(void) { - register_match6(&icmp6_match6); + xtables_register_match(&icmp6_mt6_reg); } -- cgit v1.2.3