Skip to contentSkip to conversation

parser_bison: delete chains via chain handle

PATCH Superseded Harsha Sharma 2 participants 5 messages Jan 9, 2018 – Jan 10, 2018 netfilter

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Harsha Sharma

author
#0 lore raw

cover parser_bison: delete chains via chain handle

Print chain handles with option '-a' and delete chains via chain handle

Harsha Sharma (2):
src: Print handle attribute in chains
parser_bison: extend nft to delete chain via chain handle

 src/parser_bison.y | 16 ++++++++++++++--
 src/rule.c         |  5 ++++-
 2 files changed, 18 insertions(+), 3 deletions(-)
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 1/2 src: Print handle attribute in chains

Print handle attribute in chains when listing via '-a' option.

Signed-off-by Harsha Sharma <[email protected]>
---
 src/rule.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
src/rule.c +4 -1
index e875816..7d66c22 100644
@@ -694,7 +694,10 @@ static void chain_print(const struct chain *chain, struct output_ctx *octx)
 		rule_print(rule, octx);
 		nft_print(octx, "\n");
 	}
-	nft_print(octx, "\t}\n");
+	nft_print(octx, "\t}");
+	if (octx->handle > 0)
+		nft_print(octx, " # handle %" PRIu64, chain->handle.handle.id);
+	nft_print(octx, "\n");
 }
 
 void chain_print_plain(const struct chain *chain, struct output_ctx *octx)
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH 2/2 parser_bison: extend nft to delete chain via chain handle

In reply to Harsha Sharma

This patch allows deletion of chains via unique chain handles which can be listed with '-a' option and table name and family. For eg.

nft delete chain [<family>] <table-name> [handle <handle>]

Signed-off-by Harsha Sharma <[email protected]>
---
 src/parser_bison.y | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
src/parser_bison.y +14 -2
index a5c47c2..dbe80a5 100644
@@ -495,8 +495,8 @@ int nft_lex(void *, void *, void *);
 %type <cmd>			base_cmd add_cmd replace_cmd create_cmd insert_cmd delete_cmd list_cmd reset_cmd flush_cmd rename_cmd export_cmd monitor_cmd describe_cmd
 %destructor { cmd_free($$); }	base_cmd add_cmd replace_cmd create_cmd insert_cmd delete_cmd list_cmd reset_cmd flush_cmd rename_cmd export_cmd monitor_cmd describe_cmd
 
-%type <handle>			table_spec tableid_spec chain_spec chain_identifier ruleid_spec handle_spec position_spec rule_position ruleset_spec
-%destructor { handle_free(&$$); } table_spec tableid_spec chain_spec chain_identifier ruleid_spec handle_spec position_spec rule_position ruleset_spec
+%type <handle>			table_spec tableid_spec chain_spec chainid_spec chain_identifier ruleid_spec handle_spec position_spec rule_position ruleset_spec
+%destructor { handle_free(&$$); } table_spec tableid_spec chain_spec chainid_spec chain_identifier ruleid_spec handle_spec position_spec rule_position ruleset_spec
 %type <handle>			set_spec set_identifier obj_spec obj_identifier
 %destructor { handle_free(&$$); } set_spec set_identifier obj_spec obj_identifier
 %type <val>			family_spec family_spec_explicit chain_policy prio_spec

@@ -986,6 +986,10 @@ delete_cmd		:	TABLE		table_spec
 			{
 				$$ = cmd_alloc(CMD_DELETE, CMD_OBJ_CHAIN, &$2, &@$, NULL);
 			}
+			| 	CHAIN 		chainid_spec
+			{
+				$$ = cmd_alloc(CMD_DELETE, CMD_OBJ_CHAIN, &$2, &@$, NULL);
+			}
 			|	RULE		ruleid_spec
 			{
 				$$ = cmd_alloc(CMD_DELETE, CMD_OBJ_RULE, &$2, &@$, NULL);

@@ -1680,6 +1684,14 @@ chain_spec		:	table_spec	identifier
 			}
 			;
 
+chainid_spec 		: 	table_spec 	HANDLE NUM
+			{
+				$$ 			= $1;
+				$$.handle.location 	= @$;
+				$$.handle.id 		= $3;
+			}
+			;
+
 chain_identifier	:	identifier
 			{
 				memset(&$$, 0, sizeof($$));
Signature · 1 line
2.11.0
maintainer
#3 lore raw
In reply to Harsha Sharma
Quoted 1 line · Harsha Sharma

Print chain handles with option '-a' and delete chains via chain handle

Harsha, could you send a follow up patch to add tests to tests/shell/ so we can automate that this works fine.

Thanks!

maintainer
#4 lore raw
Quoted 5 lines · Pablo Neira Ayuso
Quoted 1 line · Harsha Sharma

Print chain handles with option '-a' and delete chains via chain handle

Harsha, could you send a follow up patch to add tests to tests/shell/ so we can automate that this works fine.

Same thing applies to every new handle deletion that you add in your patches.