From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org, kaber@trash.net,
Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Subject: [nft PATCH 3/3 v3] src: add list ruleset command
Date: Fri, 26 Sep 2014 18:30:08 +0200 [thread overview]
Message-ID: <1411749008-924-1-git-send-email-arturo.borrero.glez@gmail.com> (raw)
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>
---
v2: rename function to do_list_ruleset() and use list_splice_tail_init().
v3: fixed clash with static list "table_list", and double free() of a handle.
src/parser.y | 4 ++++
src/rule.c | 28 ++++++++++++++++++++++++++++
2 files changed, 32 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 336c159..43355ee 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -782,6 +782,32 @@ err:
return -1;
}
+static int do_list_ruleset(struct netlink_ctx *ctx, struct cmd *cmd)
+{
+ struct table *table, *next;
+ LIST_HEAD(tables);
+
+ if (netlink_list_tables(ctx, &cmd->handle, &cmd->location) < 0)
+ return -1;
+
+ list_splice_tail_init(&ctx->list, &tables);
+
+ list_for_each_entry_safe(table, next, &tables, list) {
+ table_add_hash(table);
+
+ cmd->handle.family = table->handle.family;
+ cmd->handle.table = xstrdup(table->handle.table);
+
+ if (do_list_table(ctx, cmd, table) < 0)
+ return -1;
+
+ list_del(&table->list);
+ table_free(table);
+ }
+
+ return 0;
+}
+
static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
{
struct table *table = NULL;
@@ -837,6 +863,8 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
set_print(set);
}
return 0;
+ case CMD_OBJ_RULESET:
+ return do_list_ruleset(ctx, cmd);
default:
BUG("invalid command object type %u\n", cmd->obj);
}
--
1.7.10.4
next reply other threads:[~2014-09-26 16:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-26 16:30 Arturo Borrero Gonzalez [this message]
2014-09-29 10:38 ` [nft PATCH 3/3 v3] src: add list ruleset command Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411749008-924-1-git-send-email-arturo.borrero.glez@gmail.com \
--to=arturo.borrero.glez@gmail.com \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).