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/libipt_icmp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'extensions/libipt_icmp.c') diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c index b1fccbf..4361f13 100644 --- a/extensions/libipt_icmp.c +++ b/extensions/libipt_icmp.c @@ -101,10 +101,9 @@ print_icmptypes(void) static void icmp_help(void) { printf( -"ICMP v%s options:\n" +"icmp match options:\n" " --icmp-type [!] typename match icmp type\n" -" (or numeric type or type/code)\n" -"\n", IPTABLES_VERSION); +" (or numeric type or type/code)\n"); print_icmptypes(); } @@ -274,11 +273,12 @@ static void icmp_save(const void *ip, const struct xt_entry_match *match) } } -static struct iptables_match icmp_match = { +static struct xtables_match icmp_mt_reg = { .name = "icmp", - .version = IPTABLES_VERSION, - .size = IPT_ALIGN(sizeof(struct ipt_icmp)), - .userspacesize = IPT_ALIGN(sizeof(struct ipt_icmp)), + .version = XTABLES_VERSION, + .family = PF_INET, + .size = XT_ALIGN(sizeof(struct ipt_icmp)), + .userspacesize = XT_ALIGN(sizeof(struct ipt_icmp)), .help = icmp_help, .init = icmp_init, .parse = icmp_parse, @@ -289,5 +289,5 @@ static struct iptables_match icmp_match = { void _init(void) { - register_match(&icmp_match); + xtables_register_match(&icmp_mt_reg); } -- cgit v1.2.3