rule: display rule handle as comment
PATCH 1/1 rule: display rule handle as comment
Knowing the rule handle is necessary to be able to delete a single rule. It was not displayed till now in the output and it was thus impossible to remove a single rule.
This patch modify the listing output to add a comment containing the handle.
--- src/rule.c | 2 ++ 1 file changed, 2 insertions(+)
src/rule.c +2 -0
@@ -13,6 +13,7 @@#include <stdio.h> #include <stdint.h> #include <string.h> +#include <inttypes.h> #include <statement.h> #include <rule.h>
@@ -136,6 +137,7 @@ void rule_print(const struct rule *rule)printf (" " ); stmt->ops->printf (" # handle %" PRIu64, rule->handle.handle);printf ("\n" ); }
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerHi Eric,
Quoted 5 lines · Eric Leblond
Knowing the rule handle is necessary to be able to delete a single rule. It was not displayed till now in the output and it was thus impossible to remove a single rule.
This patch modify the listing output to add a comment containing the handle.
Thanks for the patch.
Could you add some option, eg. -a/--handle, so the handle is shown only if we invoke:
nft -a list table filter
We also support:
nft list table filter > rule-set-file
nft -f rule-set-file
And the handle number will not be of any use there.
PATCH 1/1 rule: add flag to display rule handle as comment
Knowing the rule handle is necessary to be able to delete a single rule. It was not displayed till now in the output and it was thus impossible to remove a single rule.
This patch modify the listing output to add a comment containing the handle when the -a/--handle flag is provided.
--- include/nftables.h | 1 + src/main.c | 12 +++++++++++- src/rule.c | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-)
include/nftables.h +1 -0
@@ -21,6 +21,7 @@ enum debug_level {#define INCLUDE_PATHS_MAX 16extern unsigned int numeric_output; +extern unsigned int handle_output;extern unsigned int debug_level;extern const char *include_paths[INCLUDE_PATHS_MAX ];
src/main.c +11 -1
@@ -26,6 +26,7 @@#include <erec.h> unsigned int numeric_output; +unsigned int handle_output;#ifdef DEBUG unsigned int debug_level;#endif
@@ -41,10 +42,11 @@ enum opt_vals {OPT_INCLUDEPATH ='I' ,OPT_NUMERIC ='n' ,OPT_DEBUG ='d' , +OPT_HANDLE_OUTPUT ='a' , OPT_INVALID = '?', }; -#define OPTSTRING "hvf:iI:vn" +#define OPTSTRING "hvf:iI:vna"static const struct option options[] = { {
@@ -81,6 +83,10 @@ static const struct option options[] = { },#endif { + .name = "handle", + .val = OPT_HANDLE_OUTPUT, + }, + { .name = NULL } };
@@ -100,6 +106,7 @@ static void show_help(const char *name)" -n/--numeric When specified once, show network addresses numerically.\n" " When specified twice, also show Internet protocols,\n" " Internet services, user IDs and group IDs numerically.\n" +" -a/--handle Output rule handle.\n" " -I/--includepath <directory> Add <directory> to the paths searched for include files.\n" #ifdef DEBUG" --debug <level [,level...]> Specify debugging level (scanner, parser, eval, netlink, all)\n"
@@ -244,6 +251,9 @@ int main(int argc, char * const *argv) }break ;#endif +case OPT_HANDLE_OUTPUT : + handle_output++; +break ;case OPT_INVALID :exit (NFT_EXIT_FAILURE ); }
src/rule.c +3 -0
@@ -13,6 +13,7 @@#include <stdio.h> #include <stdint.h> #include <string.h> +#include <inttypes.h> #include <statement.h> #include <rule.h>
@@ -136,6 +137,8 @@ void rule_print(const struct rule *rule)printf (" " ); stmt->ops->if (handle_output >0 ) +printf (" # handle %" PRIu64, rule->handle.handle);printf ("\n" ); }
Signature · 1 line
1.7.10.4
Re: [nftables PATCH] rule: add flag to display rule handle as comment
Quoted 5 lines · Eric Leblond
Knowing the rule handle is necessary to be able to delete a single rule. It was not displayed till now in the output and it was thus impossible to remove a single rule.
This patch modify the listing output to add a comment containing the handle when the -a/--handle flag is provided.
Applied, thanks Eric!
Quoted 24 lines · Eric Leblond
Knowing the rule handle is necessary to be able to delete a single rule. It was not displayed till now in the output and it was thus impossible to remove a single rule.
This patch modify the listing output to add a comment containing the handle.Signed-off-by Eric Leblond <[email protected]>---
src/rule.c| 2 ++1 file changed, 2 insertions(+)src/rule.c +1
-0@@ -13,6 +13,7 @@#include <stdio.h> #include <stdint.h> #include <string.h> +#include <inttypes.h> #include <statement.h> #include <rule.h>
src/rule.c void rule_print(const struct rule *rule) · line 143
Quoted 7 lines
src/rule.c +1
-0@@ -136,6 +137,7 @@ void rule_print(const struct rule *rule)printf (" " ); stmt->ops->printf (" # handle %" PRIu64, rule->handle.handle);printf ("\n" ); }
The output is supposed to be parsable again and should also remain as readable as possible. I discussed this with Pablo, we agreed on adding a command line switch for this.
Quoted 3 lines · Eric Leblond
Knowing the rule handle is necessary to be able to delete a single rule. It was not displayed till now in the output and it was thus impossible to remove a single rule.
The current iptables system supports deleting a specific rule by simply specifying iptables -D [...] instead of equivilant iptables -A [...]
Would it be possible to keep this semantics in nftables?
Hilsen
Jesper Brouer
--
-------------------------------------------------------------------
MSc. Master of Computer Science
Dept. of Computer Science, University of Copenhagen Author of http://www.adsl-optimizer.dk
-------------------------------------------------------------------
Quoted 7 lines · Jesper Dangaard Brouer
Quoted 3 lines · Eric Leblond
Knowing the rule handle is necessary to be able to delete a single rule. It was not displayed till now in the output and it was thus impossible to remove a single rule.
Quoted 5 lines
The current iptables system supports deleting a specific rule by simply specifying iptables -D [...] instead of equivilant iptables -A [...]
Would it be possible to keep this semantics in nftables?
Yes, I wanted to add that feature myself. Implementation would be similar to what we do in iptables, IOW we'd compare either the netlink commands constructed from the rule specification or the internal expression representation, whatever seems better suited.