From 90ed4fb3855f0d9d881b812c75e338e5e93081ba Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 11 Oct 2018 17:48:59 +0200 Subject: monitor: Fix printing of ct objects Monitor output is supposed to be single lined without tabs, but ct object were printed with newlines and tabs hard-coded. Fixing this wasn't too hard given that there is 'stmt_separator' to also include semi-colons where required if newline was removed. A more obvious mistake was position of object type in monitor output: Like with other object types, it has to occur between command and table spec. As a positive side-effect, this aligns ct objects better with others (see obj_type_name_array for instance). Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- tests/shell/testcases/listing/0013objects_0 | 2 +- tests/shell/testcases/nft-f/0017ct_timeout_obj_0 | 2 +- tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/shell') diff --git a/tests/shell/testcases/listing/0013objects_0 b/tests/shell/testcases/listing/0013objects_0 index 2d72dbb5..713c783e 100755 --- a/tests/shell/testcases/listing/0013objects_0 +++ b/tests/shell/testcases/listing/0013objects_0 @@ -15,7 +15,7 @@ EXPECTED="table ip test { ct timeout cttime { protocol udp; l3proto ip - policy = {unreplied: 15, replied: 12} + policy = { unreplied: 15, replied: 12 } } chain input { diff --git a/tests/shell/testcases/nft-f/0017ct_timeout_obj_0 b/tests/shell/testcases/nft-f/0017ct_timeout_obj_0 index 1d03dbfc..448a8207 100755 --- a/tests/shell/testcases/nft-f/0017ct_timeout_obj_0 +++ b/tests/shell/testcases/nft-f/0017ct_timeout_obj_0 @@ -4,7 +4,7 @@ EXPECTED='table ip filter { ct timeout cttime{ protocol tcp; l3proto ip - policy = {established: 123, close: 12} + policy = { established: 123, close: 12 } } chain c { diff --git a/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft b/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft index af0c627b..bca36580 100755 --- a/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft +++ b/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft @@ -2,7 +2,7 @@ table ip filter { ct timeout cttime { protocol tcp; l3proto ip - policy = {established: 123, close: 12} + policy = { established: 123, close: 12 } } chain c { -- cgit v1.2.3