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_rt.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'extensions/libip6t_rt.c') diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c index e2ae09f..b5f54ee 100644 --- a/extensions/libip6t_rt.c +++ b/extensions/libip6t_rt.c @@ -18,14 +18,14 @@ static void rt_help(void) { printf( -"RT v%s options:\n" +"rt match options:\n" " --rt-type [!] type match the type\n" " --rt-segsleft [!] num[:num] match the Segments Left field (range)\n" " --rt-len [!] length total length of this header\n" " --rt-0-res check the reserved filed, too (type 0)\n" " --rt-0-addrs ADDR[,ADDR...] Type=0 addresses (list, max: %d)\n" " --rt-0-not-strict List of Type=0 addresses not a strict list\n", -IPTABLES_VERSION, IP6T_RT_HOPS); +IP6T_RT_HOPS); } static const struct option rt_opts[] = { @@ -329,11 +329,12 @@ static void rt_save(const void *ip, const struct xt_entry_match *match) } -static struct ip6tables_match rt_match6 = { +static struct xtables_match rt_mt6_reg = { .name = "rt", - .version = IPTABLES_VERSION, - .size = IP6T_ALIGN(sizeof(struct ip6t_rt)), - .userspacesize = IP6T_ALIGN(sizeof(struct ip6t_rt)), + .version = XTABLES_VERSION, + .family = PF_INET6, + .size = XT_ALIGN(sizeof(struct ip6t_rt)), + .userspacesize = XT_ALIGN(sizeof(struct ip6t_rt)), .help = rt_help, .init = rt_init, .parse = rt_parse, @@ -345,5 +346,5 @@ static struct ip6tables_match rt_match6 = { void _init(void) { - register_match6(&rt_match6); + xtables_register_match(&rt_mt6_reg); } -- cgit v1.2.3