* [nft PATCH 1/2] rule: factorize chain and table listing code
@ 2014-09-24 9:13 Arturo Borrero Gonzalez
2014-09-24 9:13 ` [nft PATCH 2/2] src: add list ruleset command Arturo Borrero Gonzalez
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Arturo Borrero Gonzalez @ 2014-09-24 9:13 UTC (permalink / raw)
To: netfilter-devel; +Cc: kaber, pablo
Let's factorize common code. This is also useful in follow-up patches.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
src/rule.c | 67 +++++++++++++++++++++++++++++++-----------------------------
1 file changed, 35 insertions(+), 32 deletions(-)
diff --git a/src/rule.c b/src/rule.c
index 2fe2520..ac72f12 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -749,11 +749,42 @@ static void do_command_list_cleanup(struct table *table)
}
}
+static int do_command_list_table_content(struct netlink_ctx *ctx,
+ struct cmd *cmd, struct table *table)
+{
+ struct rule *rule, *nrule;
+ struct chain *chain;
+
+ if (do_list_sets(ctx, &cmd->location, table) < 0)
+ goto err;
+ if (netlink_list_chains(ctx, &cmd->handle, &cmd->location) < 0)
+ goto err;
+ list_splice_tail_init(&ctx->list, &table->chains);
+ if (netlink_list_table(ctx, &cmd->handle, &cmd->location) < 0)
+ goto err;
+
+ list_for_each_entry_safe(rule, nrule, &ctx->list, list) {
+ table = table_lookup(&rule->handle);
+ chain = chain_lookup(table, &rule->handle);
+ if (chain == NULL) {
+ chain = chain_alloc(rule->handle.chain);
+ chain_add_hash(chain, table);
+ }
+
+ list_move_tail(&rule->list, &chain->rules);
+ }
+
+ table_print(table);
+ do_command_list_cleanup(table);
+ return 0;
+err:
+ do_command_list_cleanup(table);
+ return -1;
+}
+
static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
{
struct table *table = NULL;
- struct chain *chain;
- struct rule *rule, *nrule;
struct set *set;
/* No need to allocate the table object when listing all tables */
@@ -781,24 +812,9 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
}
return 0;
}
- /* List content of this table */
- if (do_list_sets(ctx, &cmd->location, table) < 0)
- goto err;
- if (netlink_list_chains(ctx, &cmd->handle, &cmd->location) < 0)
- goto err;
- list_splice_tail_init(&ctx->list, &table->chains);
- if (netlink_list_table(ctx, &cmd->handle, &cmd->location) < 0)
- goto err;
- break;
+ return do_command_list_table_content(ctx, cmd, table);
case CMD_OBJ_CHAIN:
- if (do_list_sets(ctx, &cmd->location, table) < 0)
- goto err;
- if (netlink_list_chains(ctx, &cmd->handle, &cmd->location) < 0)
- goto err;
- list_splice_tail_init(&ctx->list, &table->chains);
- if (netlink_list_table(ctx, &cmd->handle, &cmd->location) < 0)
- goto err;
- break;
+ return do_command_list_table_content(ctx, cmd, table);
case CMD_OBJ_SETS:
if (netlink_list_sets(ctx, &cmd->handle, &cmd->location) < 0)
goto err;
@@ -825,19 +841,6 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
BUG("invalid command object type %u\n", cmd->obj);
}
- list_for_each_entry_safe(rule, nrule, &ctx->list, list) {
- table = table_lookup(&rule->handle);
- chain = chain_lookup(table, &rule->handle);
- if (chain == NULL) {
- chain = chain_alloc(rule->handle.chain);
- chain_add_hash(chain, table);
- }
-
- list_move_tail(&rule->list, &chain->rules);
- }
-
- table_print(table);
- do_command_list_cleanup(table);
return 0;
err:
do_command_list_cleanup(table);
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [nft PATCH 2/2] src: add list ruleset command
2014-09-24 9:13 [nft PATCH 1/2] rule: factorize chain and table listing code Arturo Borrero Gonzalez
@ 2014-09-24 9:13 ` Arturo Borrero Gonzalez
2014-09-24 9:58 ` Pablo Neira Ayuso
2014-09-24 9:49 ` [nft PATCH 1/2] rule: factorize chain and table listing code Pablo Neira Ayuso
2014-09-29 10:37 ` Pablo Neira Ayuso
2 siblings, 1 reply; 5+ messages in thread
From: Arturo Borrero Gonzalez @ 2014-09-24 9:13 UTC (permalink / raw)
To: netfilter-devel; +Cc: kaber, pablo
This patch adds a new command to nft:
% nft list ruleset [family]
Which list the entire ruleset.
If no family is specified, all tables of all families are listed.
Users can now make several operations at ruleset level:
% nft list ruleset > ruleset.nft
% nft -f ruleset.nft
% nft flush ruleset
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
src/parser.y | 4 ++++
src/rule.c | 29 +++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/src/parser.y b/src/parser.y
index e35eede..8f58e3a 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -753,6 +753,10 @@ list_cmd : TABLE table_spec
{
$$ = cmd_alloc(CMD_LIST, CMD_OBJ_SET, &$2, &@$, NULL);
}
+ | RULESET ruleset_spec
+ {
+ $$ = cmd_alloc(CMD_LIST, CMD_OBJ_RULESET, &$2, &@$, NULL);
+ }
;
flush_cmd : TABLE table_spec
diff --git a/src/rule.c b/src/rule.c
index ac72f12..9c13474 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -782,6 +782,33 @@ err:
return -1;
}
+static int do_command_list_ruleset(struct netlink_ctx *ctx, struct cmd *cmd)
+{
+ struct table *table, *nt;
+ struct netlink_ctx inner_ctx;
+ LIST_HEAD(msgs);
+
+ if (netlink_list_tables(ctx, &cmd->handle, &cmd->location) < 0)
+ return -1;
+
+ memset(&inner_ctx, 0, sizeof(inner_ctx));
+ init_list_head(&inner_ctx.list);
+ init_list_head(&msgs);
+ inner_ctx.msgs = &msgs;
+
+ list_for_each_entry_safe(table, nt, &ctx->list, list) {
+ table_add_hash(table);
+
+ cmd->handle.family = table->handle.family;
+ cmd->handle.table = table->handle.table;
+
+ if (do_command_list_table_content(&inner_ctx, cmd, table) < 0)
+ return -1;
+ }
+
+ return 0;
+}
+
static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
{
struct table *table = NULL;
@@ -837,6 +864,8 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
set_print(set);
}
return 0;
+ case CMD_OBJ_RULESET:
+ return do_command_list_ruleset(ctx, cmd);
default:
BUG("invalid command object type %u\n", cmd->obj);
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [nft PATCH 1/2] rule: factorize chain and table listing code
2014-09-24 9:13 [nft PATCH 1/2] rule: factorize chain and table listing code Arturo Borrero Gonzalez
2014-09-24 9:13 ` [nft PATCH 2/2] src: add list ruleset command Arturo Borrero Gonzalez
@ 2014-09-24 9:49 ` Pablo Neira Ayuso
2014-09-29 10:37 ` Pablo Neira Ayuso
2 siblings, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2014-09-24 9:49 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: netfilter-devel, kaber
On Wed, Sep 24, 2014 at 11:13:51AM +0200, Arturo Borrero Gonzalez wrote:
> Let's factorize common code. This is also useful in follow-up patches.
>
> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
> ---
> src/rule.c | 67 +++++++++++++++++++++++++++++++-----------------------------
> 1 file changed, 35 insertions(+), 32 deletions(-)
>
> diff --git a/src/rule.c b/src/rule.c
> index 2fe2520..ac72f12 100644
> --- a/src/rule.c
> +++ b/src/rule.c
> @@ -749,11 +749,42 @@ static void do_command_list_cleanup(struct table *table)
> }
> }
>
> +static int do_command_list_table_content(struct netlink_ctx *ctx,
> + struct cmd *cmd, struct table *table)
I prefer a slightly shorter name: do_list_table.
do_command_list_cleanup can probably be renamed to table_cleanup since
it has nothing to do with the commands.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [nft PATCH 2/2] src: add list ruleset command
2014-09-24 9:13 ` [nft PATCH 2/2] src: add list ruleset command Arturo Borrero Gonzalez
@ 2014-09-24 9:58 ` Pablo Neira Ayuso
0 siblings, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2014-09-24 9:58 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: netfilter-devel, kaber
On Wed, Sep 24, 2014 at 11:13:57AM +0200, Arturo Borrero Gonzalez wrote:
> This patch adds a new command to nft:
> % nft list ruleset [family]
>
> Which list the entire ruleset.
> If no family is specified, all tables of all families are listed.
>
> Users can now make several operations at ruleset level:
>
> % nft list ruleset > ruleset.nft
> % nft -f ruleset.nft
> % nft flush ruleset
>
> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
> ---
> src/parser.y | 4 ++++
> src/rule.c | 29 +++++++++++++++++++++++++++++
> 2 files changed, 33 insertions(+)
>
> diff --git a/src/parser.y b/src/parser.y
> index e35eede..8f58e3a 100644
> --- a/src/parser.y
> +++ b/src/parser.y
> @@ -753,6 +753,10 @@ list_cmd : TABLE table_spec
> {
> $$ = cmd_alloc(CMD_LIST, CMD_OBJ_SET, &$2, &@$, NULL);
> }
> + | RULESET ruleset_spec
> + {
> + $$ = cmd_alloc(CMD_LIST, CMD_OBJ_RULESET, &$2, &@$, NULL);
> + }
> ;
>
> flush_cmd : TABLE table_spec
> diff --git a/src/rule.c b/src/rule.c
> index ac72f12..9c13474 100644
> --- a/src/rule.c
> +++ b/src/rule.c
> @@ -782,6 +782,33 @@ err:
> return -1;
> }
>
> +static int do_command_list_ruleset(struct netlink_ctx *ctx, struct cmd *cmd)
I'd suggest do_list_ruleset.
So we leave the do_command_ prefix for functions that are called from
do_command().
> +{
> + struct table *table, *nt;
^
please, use 'next' whenever possible.
> + struct netlink_ctx inner_ctx;
> + LIST_HEAD(msgs);
> +
> + if (netlink_list_tables(ctx, &cmd->handle, &cmd->location) < 0)
> + return -1;
> +
> + memset(&inner_ctx, 0, sizeof(inner_ctx));
> + init_list_head(&inner_ctx.list);
> + init_list_head(&msgs);
> + inner_ctx.msgs = &msgs;
I think you can skip this inner_ctx if you declare:
LIST_HEAD(table_list);
and then you use list_splice_tail_init() to migrate the temporary
ctx->list to table_list.
> +
> + list_for_each_entry_safe(table, nt, &ctx->list, list) {
^^^^^^^^^^
Then, use table_list here to iterate over it.
> + table_add_hash(table);
> +
> + cmd->handle.family = table->handle.family;
> + cmd->handle.table = table->handle.table;
> +
> + if (do_command_list_table_content(&inner_ctx, cmd, table) < 0)
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
> {
> struct table *table = NULL;
> @@ -837,6 +864,8 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
> set_print(set);
> }
> return 0;
> + case CMD_OBJ_RULESET:
> + return do_command_list_ruleset(ctx, cmd);
> default:
> BUG("invalid command object type %u\n", cmd->obj);
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [nft PATCH 1/2] rule: factorize chain and table listing code
2014-09-24 9:13 [nft PATCH 1/2] rule: factorize chain and table listing code Arturo Borrero Gonzalez
2014-09-24 9:13 ` [nft PATCH 2/2] src: add list ruleset command Arturo Borrero Gonzalez
2014-09-24 9:49 ` [nft PATCH 1/2] rule: factorize chain and table listing code Pablo Neira Ayuso
@ 2014-09-29 10:37 ` Pablo Neira Ayuso
2 siblings, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2014-09-29 10:37 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: netfilter-devel, kaber
On Wed, Sep 24, 2014 at 11:13:51AM +0200, Arturo Borrero Gonzalez wrote:
> Let's factorize common code. This is also useful in follow-up patches.
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-29 10:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-24 9:13 [nft PATCH 1/2] rule: factorize chain and table listing code Arturo Borrero Gonzalez
2014-09-24 9:13 ` [nft PATCH 2/2] src: add list ruleset command Arturo Borrero Gonzalez
2014-09-24 9:58 ` Pablo Neira Ayuso
2014-09-24 9:49 ` [nft PATCH 1/2] rule: factorize chain and table listing code Pablo Neira Ayuso
2014-09-29 10:37 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).