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_policy.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'extensions/libip6t_policy.c') diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c index 41e5c32..eaf861e 100644 --- a/extensions/libip6t_policy.c +++ b/extensions/libip6t_policy.c @@ -25,7 +25,7 @@ static struct ip6t_policy_info *policy_info; static void policy_help(void) { printf( -"policy v%s options:\n" +"policy match options:\n" " --dir in|out match policy applied during decapsulation/\n" " policy to be applied during encapsulation\n" " --pol none|ipsec match policy\n" @@ -37,8 +37,7 @@ static void policy_help(void) "[!] --mode mode match mode (transport/tunnel)\n" "[!] --tunnel-src addr/masklen match tunnel source\n" "[!] --tunnel-dst addr/masklen match tunnel destination\n" -" --next begin next element in policy\n", - IPTABLES_VERSION); +" --next begin next element in policy\n"); } static const struct option policy_opts[] = @@ -443,11 +442,12 @@ static void policy_save(const void *ip, const struct xt_entry_match *match) } } -static struct ip6tables_match policy_match6 = { +static struct xtables_match policy_mt6_reg = { .name = "policy", - .version = IPTABLES_VERSION, - .size = IP6T_ALIGN(sizeof(struct ip6t_policy_info)), - .userspacesize = IP6T_ALIGN(sizeof(struct ip6t_policy_info)), + .version = XTABLES_VERSION, + .family = PF_INET6, + .size = XT_ALIGN(sizeof(struct ip6t_policy_info)), + .userspacesize = XT_ALIGN(sizeof(struct ip6t_policy_info)), .help = policy_help, .parse = policy_parse, .final_check = policy_check, @@ -458,5 +458,5 @@ static struct ip6tables_match policy_match6 = { void _init(void) { - register_match6(&policy_match6); + xtables_register_match(&policy_mt6_reg); } -- cgit v1.2.3