@@ -335,18 +335,18 @@ static void set_print_declaration(const struct set *set,
printf("%stimeout", delim);
delim = ",";
}
- printf("%s", opts->nl);
+ printf("%s", opts->stmt_separator);
}
if (set->timeout) {
printf("%s%stimeout ", opts->tab, opts->tab);
time_print(set->timeout / 1000);
- printf("%s", opts->nl);
+ printf("%s", opts->stmt_separator);
}
if (set->gc_int) {
printf("%s%sgc-interval ", opts->tab, opts->tab);
time_print(set->gc_int / 1000);
- printf("%s", opts->nl);
+ printf("%s", opts->stmt_separator);
}
}
@@ -381,7 +381,7 @@ void set_print_plain(const struct set *s, struct output_ctx *octx)
.nl = " ",
.table = s->handle.table,
.family = family2str(s->handle.family),
- .stmt_separator = ";",
+ .stmt_separator = "; ",
};
do_set_print(s, &opts, octx);
@@ -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 }
@@ -2,7 +2,7 @@
I add table ip t
O add table ip t
I add set ip t portrange { type inet_service; flags interval; }
-O add set ip t portrange { type inet_service;flags interval }
+O add set ip t portrange { type inet_service;flags interval; }
I add set ip t ports { type inet_service; }
O add set ip t ports { type inet_service;}
@@ -2,9 +2,9 @@
I add table ip t
O add table ip t
I add set ip t portrange { type inet_service; flags interval; }
-O add set ip t portrange { type inet_service;flags interval }
+O add set ip t portrange { type inet_service;flags interval; }
I add set ip t portrange2 { type inet_service; flags interval; }
-O add set ip t portrange2 { type inet_service;flags interval }
+O add set ip t portrange2 { type inet_service;flags interval; }
# make sure concurrent adds work
I add element ip t portrange { 1024-65535 }
@@ -2,7 +2,7 @@
I add table ip t
O add table ip t
I add set ip t portrange { type inet_service; flags interval; }
-O add set ip t portrange { type inet_service;flags interval }
+O add set ip t portrange { type inet_service;flags interval; }
# adding some ranges
I add element ip t portrange { 1-10 }
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 <phil@nwl.cc> --- Changes since v1: - Folded former patch 4 into this one since they are related. --- src/rule.c | 8 ++++---- tests/monitor/testcases/set-maps.t | 2 +- tests/monitor/testcases/set-mixed.t | 2 +- tests/monitor/testcases/set-multiple.t | 4 ++-- tests/monitor/testcases/set-simple.t | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)