diff options
Diffstat (limited to 'lib/ipset_hash_net.c')
| -rw-r--r-- | lib/ipset_hash_net.c | 165 |
1 files changed, 150 insertions, 15 deletions
diff --git a/lib/ipset_hash_net.c b/lib/ipset_hash_net.c index 4846412..a80d732 100644 --- a/lib/ipset_hash_net.c +++ b/lib/ipset_hash_net.c @@ -10,7 +10,7 @@ #include <libipset/types.h> /* prototypes */ /* Parse commandline arguments */ -static const struct ipset_arg hash_net_create_args[] = { +static const struct ipset_arg hash_net_create_args0[] = { { .name = { "family", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_FAMILY, .parse = ipset_parse_family, .print = ipset_print_family, @@ -49,7 +49,7 @@ static const struct ipset_arg hash_net_create_args[] = { { }, }; -static const struct ipset_arg hash_net_add_args[] = { +static const struct ipset_arg hash_net_add_args0[] = { { .name = { "timeout", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, .parse = ipset_parse_timeout, .print = ipset_print_number, @@ -57,7 +57,7 @@ static const struct ipset_arg hash_net_add_args[] = { { }, }; -static const char hash_net0_usage[] = +static const char hash_net_usage0[] = "create SETNAME hash:net\n" " [family inet|inet6]\n" " [hashsize VALUE] [maxelem VALUE]\n" @@ -83,8 +83,8 @@ static struct ipset_type ipset_hash_net0 = { }, }, .args = { - [IPSET_CREATE] = hash_net_create_args, - [IPSET_ADD] = hash_net_add_args, + [IPSET_CREATE] = hash_net_create_args0, + [IPSET_ADD] = hash_net_add_args0, }, .mandatory = { [IPSET_CREATE] = 0, @@ -105,11 +105,11 @@ static struct ipset_type ipset_hash_net0 = { | IPSET_FLAG(IPSET_OPT_CIDR), }, - .usage = hash_net0_usage, + .usage = hash_net_usage0, .description = "Initial revision", }; -static const char hash_net1_usage[] = +static const char hash_net_usage1[] = "create SETNAME hash:net\n" " [family inet|inet6]\n" " [hashsize VALUE] [maxelem VALUE]\n" @@ -136,8 +136,8 @@ static struct ipset_type ipset_hash_net1 = { }, }, .args = { - [IPSET_CREATE] = hash_net_create_args, - [IPSET_ADD] = hash_net_add_args, + [IPSET_CREATE] = hash_net_create_args0, + [IPSET_ADD] = hash_net_add_args0, }, .mandatory = { [IPSET_CREATE] = 0, @@ -160,11 +160,11 @@ static struct ipset_type ipset_hash_net1 = { | IPSET_FLAG(IPSET_OPT_CIDR), }, - .usage = hash_net1_usage, + .usage = hash_net_usage1, .description = "Add/del range support", }; -static const struct ipset_arg hash_net2_add_args[] = { +static const struct ipset_arg hash_net_add_args2[] = { { .name = { "timeout", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, .parse = ipset_parse_timeout, .print = ipset_print_number, @@ -176,7 +176,7 @@ static const struct ipset_arg hash_net2_add_args[] = { { }, }; -static const char hash_net2_usage[] = +static const char hash_net_usage2[] = "create SETNAME hash:net\n" " [family inet|inet6]\n" " [hashsize VALUE] [maxelem VALUE]\n" @@ -203,8 +203,8 @@ static struct ipset_type ipset_hash_net2 = { }, }, .args = { - [IPSET_CREATE] = hash_net_create_args, - [IPSET_ADD] = hash_net2_add_args, + [IPSET_CREATE] = hash_net_create_args0, + [IPSET_ADD] = hash_net_add_args2, }, .mandatory = { [IPSET_CREATE] = 0, @@ -228,14 +228,149 @@ static struct ipset_type ipset_hash_net2 = { | IPSET_FLAG(IPSET_OPT_CIDR), }, - .usage = hash_net2_usage, + .usage = hash_net_usage2, .description = "nomatch flag support", }; +/* Parse commandline arguments */ +static const struct ipset_arg hash_net_create_args3[] = { + { .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, + }, + /* Ignored options: backward compatibilty */ + { .name = { "probes", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_PROBES, + .parse = ipset_parse_ignored, .print = ipset_print_number, + }, + { .name = { "resize", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_RESIZE, + .parse = ipset_parse_ignored, .print = ipset_print_number, + }, + { }, +}; + +static const struct ipset_arg hash_net_add_args3[] = { + { .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_net_test_args3[] = { + { .name = { "nomatch", NULL }, + .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_NOMATCH, + .parse = ipset_parse_flag, .print = ipset_print_flag, + }, + { }, +}; + +static const char hash_net_usage3[] = +"create SETNAME hash:net\n" +" [family inet|inet6]\n" +" [hashsize VALUE] [maxelem VALUE]\n" +" [timeout VALUE] [counters]\n" +"add SETNAME IP[/CIDR]|FROM-TO [timeout VALUE] [nomatch]\n" +" [packets VALUE] [bytes VALUE]\n" +"del SETNAME IP[/CIDR]|FROM-TO\n" +"test SETNAME IP[/CIDR]\n\n" +"where depending on the INET family\n" +" IP is an IPv4 or IPv6 address (or hostname),\n" +" CIDR is a valid IPv4 or IPv6 CIDR prefix.\n" +" IP range is not supported with IPv6.\n"; + +static struct ipset_type ipset_hash_net3 = { + .name = "hash:net", + .alias = { "nethash", NULL }, + .revision = 3, + .family = NFPROTO_IPSET_IPV46, + .dimension = IPSET_DIM_ONE, + .elem = { + [IPSET_DIM_ONE - 1] = { + .parse = ipset_parse_ip4_net6, + .print = ipset_print_ip, + .opt = IPSET_OPT_IP + }, + }, + .args = { + [IPSET_CREATE] = hash_net_create_args3, + [IPSET_ADD] = hash_net_add_args3, + [IPSET_TEST] = hash_net_test_args3, + }, + .mandatory = { + [IPSET_CREATE] = 0, + [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_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_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_TEST] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_CIDR) + | IPSET_FLAG(IPSET_OPT_NOMATCH), + }, + + .usage = hash_net_usage3, + .description = "counters support", +}; + void _init(void); void _init(void) { ipset_type_add(&ipset_hash_net0); ipset_type_add(&ipset_hash_net1); ipset_type_add(&ipset_hash_net2); + ipset_type_add(&ipset_hash_net3); } |