diff options
Diffstat (limited to 'lib/ipset_bitmap_ip.c')
| -rw-r--r-- | lib/ipset_bitmap_ip.c | 117 |
1 files changed, 111 insertions, 6 deletions
diff --git a/lib/ipset_bitmap_ip.c b/lib/ipset_bitmap_ip.c index 212c93e..a4726db 100644 --- a/lib/ipset_bitmap_ip.c +++ b/lib/ipset_bitmap_ip.c @@ -10,7 +10,7 @@ #include <libipset/types.h> /* prototypes */ /* Parse commandline arguments */ -static const struct ipset_arg bitmap_ip_create_args[] = { +static const struct ipset_arg bitmap_ip_create_args0[] = { { .name = { "range", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP, .parse = ipset_parse_netrange, .print = ipset_print_ip, @@ -39,7 +39,7 @@ static const struct ipset_arg bitmap_ip_create_args[] = { { }, }; -static const struct ipset_arg bitmap_ip_add_args[] = { +static const struct ipset_arg bitmap_ip_add_args0[] = { { .name = { "timeout", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, .parse = ipset_parse_timeout, .print = ipset_print_number, @@ -47,7 +47,7 @@ static const struct ipset_arg bitmap_ip_add_args[] = { { }, }; -static const char bitmap_ip_usage[] = +static const char bitmap_ip_usage0[] = "create SETNAME bitmap:ip range IP/CIDR|FROM-TO\n" " [netmask CIDR] [timeout VALUE]\n" "add SETNAME IP|IP/CIDR|FROM-TO [timeout VALUE]\n" @@ -70,8 +70,8 @@ static struct ipset_type ipset_bitmap_ip0 = { }, }, .args = { - [IPSET_CREATE] = bitmap_ip_create_args, - [IPSET_ADD] = bitmap_ip_add_args, + [IPSET_CREATE] = bitmap_ip_create_args0, + [IPSET_ADD] = bitmap_ip_add_args0, }, .mandatory = { [IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP) @@ -93,12 +93,117 @@ static struct ipset_type ipset_bitmap_ip0 = { [IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP), }, - .usage = bitmap_ip_usage, + .usage = bitmap_ip_usage0, .description = "Initial revision", }; +/* Parse commandline arguments */ +static const struct ipset_arg bitmap_ip_create_args1[] = { + { .name = { "range", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP, + .parse = ipset_parse_netrange, .print = ipset_print_ip, + }, + { .name = { "netmask", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_NETMASK, + .parse = ipset_parse_netmask, .print = ipset_print_number, + }, + { .name = { "timeout", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, + .parse = ipset_parse_timeout, .print = ipset_print_number, + }, + { .name = { "counters", NULL }, + .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_COUNTERS, + .parse = ipset_parse_flag, .print = ipset_print_flag, + }, + /* Backward compatibility */ + { .name = { "from", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP, + .parse = ipset_parse_single_ip, + }, + { .name = { "to", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP_TO, + .parse = ipset_parse_single_ip, + }, + { .name = { "network", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP, + .parse = ipset_parse_net, + }, + { }, +}; + +static const struct ipset_arg bitmap_ip_add_args1[] = { + { .name = { "timeout", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, + .parse = ipset_parse_timeout, .print = ipset_print_number, + }, + { .name = { "packets", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_PACKETS, + .parse = ipset_parse_uint64, .print = ipset_print_number, + }, + { .name = { "bytes", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_BYTES, + .parse = ipset_parse_uint64, .print = ipset_print_number, + }, + { }, +}; + +static const char bitmap_ip_usage1[] = +"create SETNAME bitmap:ip range IP/CIDR|FROM-TO\n" +" [netmask CIDR] [timeout VALUE] [counters]\n" +"add SETNAME IP|IP/CIDR|FROM-TO [timeout VALUE]\n" +" [packets VALUE] [bytes VALUE]\n" +"del SETNAME IP|IP/CIDR|FROM-TO\n" +"test SETNAME IP\n\n" +"where IP, FROM and TO are IPv4 addresses (or hostnames),\n" +" CIDR is a valid IPv4 CIDR prefix.\n"; + +static struct ipset_type ipset_bitmap_ip1 = { + .name = "bitmap:ip", + .alias = { "ipmap", NULL }, + .revision = 1, + .family = NFPROTO_IPV4, + .dimension = IPSET_DIM_ONE, + .elem = { + [IPSET_DIM_ONE - 1] = { + .parse = ipset_parse_ip, + .print = ipset_print_ip, + .opt = IPSET_OPT_IP + }, + }, + .args = { + [IPSET_CREATE] = bitmap_ip_create_args1, + [IPSET_ADD] = bitmap_ip_add_args1, + }, + .mandatory = { + [IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_IP_TO), + [IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP), + [IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP), + [IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP), + }, + .full = { + [IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_IP_TO) + | IPSET_FLAG(IPSET_OPT_NETMASK) + | IPSET_FLAG(IPSET_OPT_TIMEOUT) + | IPSET_FLAG(IPSET_OPT_COUNTERS), + [IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_IP_TO) + | IPSET_FLAG(IPSET_OPT_TIMEOUT) + | IPSET_FLAG(IPSET_OPT_PACKETS) + | IPSET_FLAG(IPSET_OPT_BYTES), + [IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_IP_TO), + [IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP), + }, + + .usage = bitmap_ip_usage1, + .description = "counters support", +}; + void _init(void); void _init(void) { ipset_type_add(&ipset_bitmap_ip0); + ipset_type_add(&ipset_bitmap_ip1); } |