From 8a3b2e7327a3057b5976df4af387b8143aad6110 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 25 Jul 2017 20:39:42 +0200 Subject: monitor: Fix printing of set declarations The optional attributes 'flags', 'gc-interval' and 'timeout' have to be delimited by stmt_separator (either newline or semicolon), not 'nl' which is set to whitespace by set_print_plain(). In order to restore readability, change stmt_separator to include a single whitespace after the semicolon. Here's monitor output for the following command: | # nft add set ip t testset { type inet_service; \ | timeout 60s; gc-interval 120s; } Before this patch: | add set ip t testset { type inet_service;timeout 1m gc-interval 2m } With this patch applied: | add set ip t testset { type inet_service; timeout 1m; gc-interval 2m; } Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- tests/monitor/testcases/set-maps.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/monitor/testcases/set-maps.t') diff --git a/tests/monitor/testcases/set-maps.t b/tests/monitor/testcases/set-maps.t index d94016be..6ea36cb9 100644 --- a/tests/monitor/testcases/set-maps.t +++ b/tests/monitor/testcases/set-maps.t @@ -2,7 +2,7 @@ I add table ip t O add table ip t I add map ip t portip { type inet_service: ipv4_addr; flags interval; } -O add map ip t portip { type inet_service : ipv4_addr;flags interval } +O add map ip t portip { type inet_service : ipv4_addr;flags interval; } I add element ip t portip { 80-100: 10.0.0.1 } O add element ip t portip { 80-100 : 10.0.0.1 } -- cgit v1.2.3