From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: kaber@trash.net, pablo@netfilter.org
Subject: [nft PATCH 2/2] src: add list ruleset command
Date: Wed, 24 Sep 2014 11:13:57 +0200 [thread overview]
Message-ID: <20140924091357.13585.3487.stgit@nfdev.cica.es> (raw)
In-Reply-To: <20140924091351.13585.92650.stgit@nfdev.cica.es>
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);
}
next prev parent reply other threads:[~2014-09-24 9:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2014-09-24 9:58 ` [nft PATCH 2/2] src: add list ruleset command 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
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=20140924091357.13585.3487.stgit@nfdev.cica.es \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.