From 0d32c5c070f817229110f92d7b31df9a3e4eeec5 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Sun, 24 Oct 2010 21:42:48 +0200 Subject: Fixes, cleanups, comments - More comments added to the code - ICMP and ICMPv6 support added to the hash:ip,port, hash:ip,port,ip and hash:ip,port,net types - hash:net and hash:ip,port,net types are reworked - hash:net,port type added - Wrong direction parameters fixed in hash:ip,port - Helps and manpage are updated - More tests added - Ugly macros are rewritten to functions in parse.c (Holger Eitzenberger) - resize related bug in hash types fixed (Holger Eitzenberger) - autoreconf patches by Jan Engelhardt applied - netlink patch minimalized: dumping can be initialized by a second parsing of the message (thanks to David and Patrick for the suggestion) - IPv4/IPv6 address attributes are introduced in order to fix the context (suggested by David) --- src/ipset_bitmap_port.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/ipset_bitmap_port.c') diff --git a/src/ipset_bitmap_port.c b/src/ipset_bitmap_port.c index 7871891..82b98a4 100644 --- a/src/ipset_bitmap_port.c +++ b/src/ipset_bitmap_port.c @@ -13,7 +13,7 @@ static const struct ipset_arg bitmap_port_create_args[] = { { .name = { "range", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_PORT, - .parse = ipset_parse_port, .print = ipset_print_port, + .parse = ipset_parse_tcp_port, .print = ipset_print_port, }, { .name = { "timeout", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, @@ -22,11 +22,11 @@ static const struct ipset_arg bitmap_port_create_args[] = { /* Backward compatibility */ { .name = { "from", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_PORT, - .parse = ipset_parse_single_port, + .parse = ipset_parse_single_tcp_port, }, { .name = { "to", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_PORT_TO, - .parse = ipset_parse_single_port, + .parse = ipset_parse_single_tcp_port, }, { }, }; @@ -44,7 +44,8 @@ static const char bitmap_port_usage[] = " [timeout VALUE]\n" "add SETNAME PORT|FROM-TO [timeout VALUE]\n" "del SETNAME PORT|FROM-TO\n" -"test SETNAME PORT\n"; +"test SETNAME PORT\n\n" +"where PORT, FROM and TO are port numbers or port names from /etc/services.\n"; struct ipset_type ipset_bitmap_port0 = { .name = "bitmap:port", @@ -54,7 +55,7 @@ struct ipset_type ipset_bitmap_port0 = { .dimension = IPSET_DIM_ONE, .elem = { [IPSET_DIM_ONE] = { - .parse = ipset_parse_port, + .parse = ipset_parse_tcp_port, .print = ipset_print_port, .opt = IPSET_OPT_PORT }, -- cgit v1.2.3