diff mbox

[nft] rule: fix printing of rule comments

Message ID 20151008092724.23737.63936.stgit@r2d2.cica.es
State Accepted
Delegated to: Pablo Neira
Headers show

Commit Message

Arturo Borrero Gonzalez Oct. 8, 2015, 9:27 a.m. UTC 
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(-)


--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Pablo Neira Ayuso Oct. 8, 2015, 4:18 p.m. UTC | #1 
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!
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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");
 }