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_list_set.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 107 insertions(+), 8 deletions(-) (limited to 'lib/ipset_list_set.c') diff --git a/lib/ipset_list_set.c b/lib/ipset_list_set.c index b54c42e..6cec67c 100644 --- a/lib/ipset_list_set.c +++ b/lib/ipset_list_set.c @@ -10,7 +10,7 @@ #include /* prototypes */ /* Parse commandline arguments */ -static const struct ipset_arg list_set_create_args[] = { +static const struct ipset_arg list_set_create_args0[] = { { .name = { "size", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_SIZE, .parse = ipset_parse_uint32, .print = ipset_print_number, @@ -22,7 +22,7 @@ static const struct ipset_arg list_set_create_args[] = { { }, }; -static const struct ipset_arg list_set_adt_args[] = { +static const struct ipset_arg list_set_adt_args0[] = { { .name = { "timeout", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, .parse = ipset_parse_timeout, .print = ipset_print_number, @@ -38,7 +38,7 @@ static const struct ipset_arg list_set_adt_args[] = { { }, }; -static const char list_set_usage[] = +static const char list_set_usage0[] = "create SETNAME list:set\n" " [size VALUE] [timeout VALUE]\n" "add SETNAME NAME [before|after NAME] [timeout VALUE]\n" @@ -61,10 +61,10 @@ static struct ipset_type ipset_list_set0 = { }, .compat_parse_elem = ipset_parse_name_compat, .args = { - [IPSET_CREATE] = list_set_create_args, - [IPSET_ADD] = list_set_adt_args, - [IPSET_DEL] = list_set_adt_args, - [IPSET_TEST] = list_set_adt_args, + [IPSET_CREATE] = list_set_create_args0, + [IPSET_ADD] = list_set_adt_args0, + [IPSET_DEL] = list_set_adt_args0, + [IPSET_TEST] = list_set_adt_args0, }, .mandatory = { [IPSET_CREATE] = 0, @@ -87,12 +87,111 @@ static struct ipset_type ipset_list_set0 = { | IPSET_FLAG(IPSET_OPT_NAMEREF), }, - .usage = list_set_usage, + .usage = list_set_usage0, .description = "Initial revision", }; +/* Parse commandline arguments */ +static const struct ipset_arg list_set_create_args1[] = { + { .name = { "size", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_SIZE, + .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 list_set_adt_args1[] = { + { .name = { "timeout", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, + .parse = ipset_parse_timeout, .print = ipset_print_number, + }, + { .name = { "before", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_NAMEREF, + .parse = ipset_parse_before, + }, + { .name = { "after", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_NAMEREF, + .parse = ipset_parse_after, + }, + { .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 list_set_usage1[] = +"create SETNAME list:set\n" +" [size VALUE] [timeout VALUE] [counters\n" +"add SETNAME NAME [before|after NAME] [timeout VALUE]\n" +" [packets VALUE] [bytes VALUE]\n" +"del SETNAME NAME [before|after NAME]\n" +"test SETNAME NAME [before|after NAME]\n\n" +"where NAME are existing set names.\n"; + +static struct ipset_type ipset_list_set1 = { + .name = "list:set", + .alias = { "setlist", NULL }, + .revision = 1, + .family = NFPROTO_UNSPEC, + .dimension = IPSET_DIM_ONE, + .elem = { + [IPSET_DIM_ONE - 1] = { + .parse = ipset_parse_setname, + .print = ipset_print_name, + .opt = IPSET_OPT_NAME + }, + }, + .compat_parse_elem = ipset_parse_name_compat, + .args = { + [IPSET_CREATE] = list_set_create_args1, + [IPSET_ADD] = list_set_adt_args1, + [IPSET_DEL] = list_set_adt_args1, + [IPSET_TEST] = list_set_adt_args1, + }, + .mandatory = { + [IPSET_CREATE] = 0, + [IPSET_ADD] = IPSET_FLAG(IPSET_OPT_NAME), + [IPSET_DEL] = IPSET_FLAG(IPSET_OPT_NAME), + [IPSET_TEST] = IPSET_FLAG(IPSET_OPT_NAME), + }, + .full = { + [IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_SIZE) + | IPSET_FLAG(IPSET_OPT_TIMEOUT) + | IPSET_FLAG(IPSET_OPT_COUNTERS), + [IPSET_ADD] = IPSET_FLAG(IPSET_OPT_NAME) + | IPSET_FLAG(IPSET_OPT_BEFORE) + | IPSET_FLAG(IPSET_OPT_NAMEREF) + | IPSET_FLAG(IPSET_OPT_TIMEOUT) + | IPSET_FLAG(IPSET_OPT_PACKETS) + | IPSET_FLAG(IPSET_OPT_BYTES), + [IPSET_DEL] = IPSET_FLAG(IPSET_OPT_NAME) + | IPSET_FLAG(IPSET_OPT_BEFORE) + | IPSET_FLAG(IPSET_OPT_NAMEREF), + [IPSET_TEST] = IPSET_FLAG(IPSET_OPT_NAME) + | IPSET_FLAG(IPSET_OPT_BEFORE) + | IPSET_FLAG(IPSET_OPT_NAMEREF), + }, + + .usage = list_set_usage1, + .description = "counters support", +}; + void _init(void); void _init(void) { ipset_type_add(&ipset_list_set0); + ipset_type_add(&ipset_list_set1); } -- cgit v1.2.3