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().
Signed-off-by: Phil Sutter <phil@xxxxxx>
---
src/rule.c | 6 +++---
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, 8 insertions(+), 8 deletions(-)
diff --git a/src/rule.c b/src/rule.c
index 7f83980c60818..5ea4fce546e30 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);
}
}
diff --git a/tests/monitor/testcases/set-maps.t b/tests/monitor/testcases/set-maps.t
index d94016beb0767..6ea36cb9d11d6 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 }
diff --git a/tests/monitor/testcases/set-mixed.t b/tests/monitor/testcases/set-mixed.t
index c4699edacec11..2eb35b5aa1efb 100644
--- a/tests/monitor/testcases/set-mixed.t
+++ b/tests/monitor/testcases/set-mixed.t
@@ -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;}
diff --git a/tests/monitor/testcases/set-multiple.t b/tests/monitor/testcases/set-multiple.t
index d94f941b39693..ce919125a593f 100644
--- a/tests/monitor/testcases/set-multiple.t
+++ b/tests/monitor/testcases/set-multiple.t
@@ -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 }
diff --git a/tests/monitor/testcases/set-simple.t b/tests/monitor/testcases/set-simple.t
index 22f648dbfa232..e44cce08f575c 100644
--- a/tests/monitor/testcases/set-simple.t
+++ b/tests/monitor/testcases/set-simple.t
@@ -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 }
--
2.13.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
