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_ipv6header.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'extensions/libip6t_ipv6header.c') diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c index c20fb94..5597872 100644 --- a/extensions/libip6t_ipv6header.c +++ b/extensions/libip6t_ipv6header.c @@ -137,14 +137,13 @@ add_proto_to_mask(int proto){ static void ipv6header_help(void) { printf( -"ipv6header v%s match options:\n" +"ipv6header match options:\n" "--header [!] headers Type of header to match, by name\n" " names: hop,dst,route,frag,auth,esp,none,proto\n" " long names: hop-by-hop,ipv6-opts,ipv6-route,\n" " ipv6-frag,ah,esp,ipv6-nonxt,protocol\n" " numbers: 0,60,43,44,51,50,59\n" -"--soft The header CONTAINS the specified extensions\n", - IPTABLES_VERSION); +"--soft The header CONTAINS the specified extensions\n"); } static const struct option ipv6header_opts[] = { @@ -286,11 +285,12 @@ static void ipv6header_save(const void *ip, const struct xt_entry_match *match) return; } -static struct ip6tables_match ipv6header_match6 = { +static struct xtables_match ipv6header_mt6_reg = { .name = "ipv6header", - .version = IPTABLES_VERSION, - .size = IP6T_ALIGN(sizeof(struct ip6t_ipv6header_info)), - .userspacesize = IP6T_ALIGN(sizeof(struct ip6t_ipv6header_info)), + .version = XTABLES_VERSION, + .family = PF_INET6, + .size = XT_ALIGN(sizeof(struct ip6t_ipv6header_info)), + .userspacesize = XT_ALIGN(sizeof(struct ip6t_ipv6header_info)), .help = ipv6header_help, .init = ipv6header_init, .parse = ipv6header_parse, @@ -302,5 +302,5 @@ static struct ip6tables_match ipv6header_match6 = { void _init(void) { - register_match6(&ipv6header_match6); + xtables_register_match(&ipv6header_mt6_reg); } -- cgit v1.2.3