src: add support for listing the entire ruleset
PATCH 1/1 src: add support for listing the entire ruleset
This patch add the following operation:
:~# nft list ruleset
With this, you can backup your current ruleset and import later with '-f'.
Signed-off-by Arturo Borrero Gonzalez <[email protected]>
--- include/rule.h | 1 + src/parser.y | 17 +++++++++++++++-- src/rule.c | 20 ++++++++++++++++++++ src/scanner.l | 1 + 4 files changed, 37 insertions(+), 2 deletions(-)
include/rule.h +1 -0
@@ -234,6 +234,7 @@ enum cmd_obj {CMD_OBJ_RULE ,CMD_OBJ_CHAIN ,CMD_OBJ_TABLE , + CMD_OBJ_RULESET, };/**
src/parser.y +15 -2
@@ -157,6 +157,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token HOOK "hook" %token TABLE "table" %token TABLES "tables" +%token RULESET "ruleset" %token CHAIN "chain" %token RULE "rule" %token SETS "sets"
@@ -340,8 +341,8 @@ static void location_update(struct location *loc, struct location *rhs, int n) %type <cmd> base_cmd add_cmd insert_cmd delete_cmd list_cmd flush_cmd rename_cmd %destructor { cmd_free($$); } base_cmd add_cmd insert_cmd delete_cmd list_cmd flush_cmd rename_cmd -%type <handle> table_spec tables_spec chain_spec chain_identifier ruleid_spec -%destructor { handle_free(&$$); } table_spec tables_spec chain_spec chain_identifier ruleid_spec +%type <handle> table_spec tables_spec ruleset_spec chain_spec chain_identifier ruleid_spec +%destructor { handle_free(&$$); } table_spec tables_spec ruleset_spec chain_spec chain_identifier ruleid_spec %type <handle> set_spec set_identifier %destructor { handle_free(&$$); } set_spec set_identifier %type <val> handle_spec family_spec position_spec
@@ -618,6 +619,10 @@ list_cmd : TABLE table_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_TABLE, &$2, &@$, NULL); } + | RULESET ruleset_spec + { + $$ = cmd_alloc(CMD_LIST, CMD_OBJ_RULESET, &$2, &@$, NULL); + } | CHAIN chain_spec { $$ = cmd_alloc(CMD_LIST, CMD_OBJ_CHAIN, &$2, &@$, NULL);
@@ -833,6 +838,14 @@ tables_spec : family_spec } ; +ruleset_spec : /* XXXX support json and xml output */ + { + memset(&$$, 0, sizeof($$)); + $$.family = NFPROTO_UNSPEC; + $$.table = NULL; + } + ; + chain_spec : table_spec identifier { $$ = $1;
src/rule.c +20 -0
@@ -583,6 +583,7 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)struct chain *chain, *nchain;struct rule *rule, *nrule;struct set *set, *nset; +struct netlink_ctx ctx_index;/* No need to allocate the table object when listing all tables */ if (cmd->handle.table !=NULL ) {
@@ -595,6 +596,25 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd) }switch (cmd->obj) { +case CMD_OBJ_RULESET : + cmd->handle.family =NFPROTO_UNSPEC ; +if (netlink_list_tables (ctx, &cmd->handle, &cmd->location) <0 ) +return -1 ; + +memset (&ctx_index,0 ,sizeof (ctx_index)); + ctx_index.msgs = ctx->msgs; + ctx_index.seqnum = cmd->seqnum; +init_list_head (&ctx_index.list); + + cmd->obj =CMD_OBJ_TABLE ; + +list_for_each_entry (table, &ctx->list, list) { + cmd->handle.family = table->handle.family; + cmd->handle.table = table->handle.table; +if (do_command_list (&ctx_index, cmd) !=0 ) +return -1 ; + } +return 0 ;case CMD_OBJ_TABLE :if (!cmd->handle.table) {/* List all existing tables */
src/scanner.l +1 -0
@@ -220,6 +220,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "hook" { return HOOK; } "table" { return TABLE; } "tables" { return TABLES; } +"ruleset" { return RULESET; } "chain" { return CHAIN; } "rule" { return RULE; } "sets" { return SETS; }