* [nft PATCH] rule: fix printing of rule comments
@ 2015-10-08 9:27 Arturo Borrero Gonzalez
2015-10-08 16:18 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Arturo Borrero Gonzalez @ 2015-10-08 9:27 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo
From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Several fixes:
* handles are printed last
* simplify space games (an extra space was being printed)
* comments are shown with `nft monitor' as well (missing before this patch)
Before this patch:
% nft list ruleset -a
[...]
chain test {
iifname eth0 # handle 1 comment "test"
}
[...]
% nft list ruleset
[...]
chain test {
iifname eth0 comment "test"
^^
}
[...]
% nft monitor &
% nft add rule test test iifname eth0 comment "test"
add rule test test iifname eth0
After this patch:
% nft list ruleset -a
chain test {
iifname eth0 comment "test" # handle 1
^
}
% nft monitor -a &
% nft add rule test test iifname eth0 comment "test"
add rule test test iifname eth0 comment "test" # handle 1
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
src/rule.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/rule.c b/src/rule.c
index 92b83f0..1bf0e03 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -383,6 +383,10 @@ void rule_print(const struct rule *rule)
stmt->ops->print(stmt);
printf(" ");
}
+
+ if (rule->handle.comment)
+ printf("comment \"%s\" ", rule->handle.comment);
+
if (handle_output > 0)
printf("# handle %" PRIu64, rule->handle.handle);
}
@@ -622,10 +626,7 @@ static void chain_print(const struct chain *chain)
list_for_each_entry(rule, &chain->rules, list) {
printf("\t\t");
rule_print(rule);
- if (rule->handle.comment)
- printf(" comment \"%s\"\n", rule->handle.comment);
- else
- printf("\n");
+ printf("\n");
}
printf("\t}\n");
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [nft PATCH] rule: fix printing of rule comments
2015-10-08 9:27 [nft PATCH] rule: fix printing of rule comments Arturo Borrero Gonzalez
@ 2015-10-08 16:18 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2015-10-08 16:18 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: netfilter-devel
On Thu, Oct 08, 2015 at 11:27:24AM +0200, Arturo Borrero Gonzalez wrote:
> From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
>
> Several fixes:
> * handles are printed last
> * simplify space games (an extra space was being printed)
> * comments are shown with `nft monitor' as well (missing before this patch)
Applied, thanks Arturo!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-08 16:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-08 9:27 [nft PATCH] rule: fix printing of rule comments Arturo Borrero Gonzalez
2015-10-08 16:18 ` Pablo Neira Ayuso
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).