From 2222b6adb0be1bdffd58875c5c874e89b0aec4cd Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Tue, 9 Apr 2013 17:17:50 +0200 Subject: Introduce the new set type revisions with counter support Signed-off-by: Jozsef Kadlecsik --- lib/ipset_hash_netport.c | 178 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 163 insertions(+), 15 deletions(-) (limited to 'lib/ipset_hash_netport.c') diff --git a/lib/ipset_hash_netport.c b/lib/ipset_hash_netport.c index 2319738..2b26cf2 100644 --- a/lib/ipset_hash_netport.c +++ b/lib/ipset_hash_netport.c @@ -11,7 +11,7 @@ #include /* prototypes */ /* Parse commandline arguments */ -static const struct ipset_arg hash_netport_create_args[] = { +static const struct ipset_arg hash_netport_create_args1[] = { { .name = { "family", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_FAMILY, .parse = ipset_parse_family, .print = ipset_print_family, @@ -41,7 +41,7 @@ static const struct ipset_arg hash_netport_create_args[] = { { }, }; -static const struct ipset_arg hash_netport_add_args[] = { +static const struct ipset_arg hash_netport_add_args1[] = { { .name = { "timeout", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, .parse = ipset_parse_timeout, .print = ipset_print_number, @@ -49,7 +49,7 @@ static const struct ipset_arg hash_netport_add_args[] = { { }, }; -static const char hash_netport1_usage[] = +static const char hash_netport_usage1[] = "create SETNAME hash:net,port\n" " [family inet|inet6]\n" " [hashsize VALUE] [maxelem VALUE]\n" @@ -82,8 +82,8 @@ static struct ipset_type ipset_hash_netport1 = { }, }, .args = { - [IPSET_CREATE] = hash_netport_create_args, - [IPSET_ADD] = hash_netport_add_args, + [IPSET_CREATE] = hash_netport_create_args1, + [IPSET_ADD] = hash_netport_add_args1, }, .mandatory = { [IPSET_CREATE] = 0, @@ -118,12 +118,12 @@ static struct ipset_type ipset_hash_netport1 = { | IPSET_FLAG(IPSET_OPT_CIDR), }, - .usage = hash_netport1_usage, + .usage = hash_netport_usage1, .usagefn = ipset_port_usage, .description = "SCTP and UDPLITE support", }; -static const char hash_netport2_usage[] = +static const char hash_netport_usage2[] = "create SETNAME hash:net,port\n" " [family inet|inet6]\n" " [hashsize VALUE] [maxelem VALUE]\n" @@ -157,8 +157,8 @@ static struct ipset_type ipset_hash_netport2 = { }, }, .args = { - [IPSET_CREATE] = hash_netport_create_args, - [IPSET_ADD] = hash_netport_add_args, + [IPSET_CREATE] = hash_netport_create_args1, + [IPSET_ADD] = hash_netport_add_args1, }, .mandatory = { [IPSET_CREATE] = 0, @@ -195,12 +195,12 @@ static struct ipset_type ipset_hash_netport2 = { | IPSET_FLAG(IPSET_OPT_PROTO), }, - .usage = hash_netport2_usage, + .usage = hash_netport_usage2, .usagefn = ipset_port_usage, .description = "Add/del range support", }; -static const struct ipset_arg hash_netport3_add_args[] = { +static const struct ipset_arg hash_netport_add_args3[] = { { .name = { "timeout", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, .parse = ipset_parse_timeout, .print = ipset_print_number, @@ -212,7 +212,7 @@ static const struct ipset_arg hash_netport3_add_args[] = { { }, }; -static const char hash_netport3_usage[] = +static const char hash_netport_usage3[] = "create SETNAME hash:net,port\n" " [family inet|inet6]\n" " [hashsize VALUE] [maxelem VALUE]\n" @@ -246,8 +246,8 @@ static struct ipset_type ipset_hash_netport3 = { }, }, .args = { - [IPSET_CREATE] = hash_netport_create_args, - [IPSET_ADD] = hash_netport3_add_args, + [IPSET_CREATE] = hash_netport_create_args1, + [IPSET_ADD] = hash_netport_add_args3, }, .mandatory = { [IPSET_CREATE] = 0, @@ -285,15 +285,163 @@ static struct ipset_type ipset_hash_netport3 = { | IPSET_FLAG(IPSET_OPT_PROTO), }, - .usage = hash_netport3_usage, + .usage = hash_netport_usage3, .usagefn = ipset_port_usage, .description = "nomatch flag support", }; +/* Parse commandline arguments */ +static const struct ipset_arg hash_netport_create_args4[] = { + { .name = { "family", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_FAMILY, + .parse = ipset_parse_family, .print = ipset_print_family, + }, + /* Alias: family inet */ + { .name = { "-4", NULL }, + .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_FAMILY, + .parse = ipset_parse_family, + }, + /* Alias: family inet6 */ + { .name = { "-6", NULL }, + .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_FAMILY, + .parse = ipset_parse_family, + }, + { .name = { "hashsize", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_HASHSIZE, + .parse = ipset_parse_uint32, .print = ipset_print_number, + }, + { .name = { "maxelem", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_MAXELEM, + .parse = ipset_parse_uint32, .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, + }, + { }, +}; + +static const struct ipset_arg hash_netport_add_args4[] = { + { .name = { "timeout", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, + .parse = ipset_parse_timeout, .print = ipset_print_number, + }, + { .name = { "nomatch", NULL }, + .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_NOMATCH, + .parse = ipset_parse_flag, .print = ipset_print_flag, + }, + { .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 struct ipset_arg hash_netport_test_args4[] = { + { .name = { "nomatch", NULL }, + .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_NOMATCH, + .parse = ipset_parse_flag, .print = ipset_print_flag, + }, + { }, +}; + +static const char hash_netport_usage4[] = +"create SETNAME hash:net,port\n" +" [family inet|inet6]\n" +" [hashsize VALUE] [maxelem VALUE]\n" +" [timeout VALUE] [counters]\n" +"add SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT [timeout VALUE] [nomatch]\n" +" [packets VALUE] [bytes VALUE]\n" +"del SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT\n" +"test SETNAME IP[/CIDR],PROTO:PORT\n\n" +"where depending on the INET family\n" +" IP is a valid IPv4 or IPv6 address (or hostname),\n" +" CIDR is a valid IPv4 or IPv6 CIDR prefix.\n" +" Adding/deleting multiple elements with IPv4 is supported.\n" +" Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n" +" port range is supported both for IPv4 and IPv6.\n"; + +static struct ipset_type ipset_hash_netport4 = { + .name = "hash:net,port", + .alias = { "netporthash", NULL }, + .revision = 4, + .family = NFPROTO_IPSET_IPV46, + .dimension = IPSET_DIM_TWO, + .elem = { + [IPSET_DIM_ONE - 1] = { + .parse = ipset_parse_ip4_net6, + .print = ipset_print_ip, + .opt = IPSET_OPT_IP + }, + [IPSET_DIM_TWO - 1] = { + .parse = ipset_parse_proto_port, + .print = ipset_print_proto_port, + .opt = IPSET_OPT_PORT + }, + }, + .args = { + [IPSET_CREATE] = hash_netport_create_args4, + [IPSET_ADD] = hash_netport_add_args4, + [IPSET_TEST] = hash_netport_test_args4, + }, + .mandatory = { + [IPSET_CREATE] = 0, + [IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_PROTO) + | IPSET_FLAG(IPSET_OPT_PORT), + [IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_PROTO) + | IPSET_FLAG(IPSET_OPT_PORT), + [IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_PROTO) + | IPSET_FLAG(IPSET_OPT_PORT), + }, + .full = { + [IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE) + | IPSET_FLAG(IPSET_OPT_MAXELEM) + | IPSET_FLAG(IPSET_OPT_TIMEOUT) + | IPSET_FLAG(IPSET_OPT_COUNTERS), + [IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_CIDR) + | IPSET_FLAG(IPSET_OPT_IP_TO) + | IPSET_FLAG(IPSET_OPT_PORT) + | IPSET_FLAG(IPSET_OPT_PORT_TO) + | IPSET_FLAG(IPSET_OPT_PROTO) + | IPSET_FLAG(IPSET_OPT_TIMEOUT) + | IPSET_FLAG(IPSET_OPT_NOMATCH) + | IPSET_FLAG(IPSET_OPT_PACKETS) + | IPSET_FLAG(IPSET_OPT_BYTES), + [IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_CIDR) + | IPSET_FLAG(IPSET_OPT_IP_TO) + | IPSET_FLAG(IPSET_OPT_PORT) + | IPSET_FLAG(IPSET_OPT_PORT_TO) + | IPSET_FLAG(IPSET_OPT_PROTO), + [IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_CIDR) + | IPSET_FLAG(IPSET_OPT_PORT) + | IPSET_FLAG(IPSET_OPT_PROTO) + | IPSET_FLAG(IPSET_OPT_NOMATCH), + }, + + .usage = hash_netport_usage4, + .usagefn = ipset_port_usage, + .description = "counters support", +}; + void _init(void); void _init(void) { ipset_type_add(&ipset_hash_netport1); ipset_type_add(&ipset_hash_netport2); ipset_type_add(&ipset_hash_netport3); + ipset_type_add(&ipset_hash_netport4); } -- cgit v1.2.3