summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2017-07-25 20:39:42 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2017-07-27 10:50:21 +0200
commit8a3b2e7327a3057b5976df4af387b8143aad6110 (patch)
tree6122fd07ab0e7caba68e5c90fd8f2e30ad08663f /src
parent9c870174df2837131359f2876d4675d0f5ffe86a (diff)
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 <phil@nwl.cc> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r--src/rule.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rule.c b/src/rule.c
index 7f83980c..12714ed3 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -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);