diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-01 19:56:08 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-01 20:43:02 +0200 |
commit | a9b0c385a1d5e29dfa5d222e31a6ba7de338484a (patch) | |
tree | b7ae70f8d7c7919514b1ee50b727d9233c37eae7 | |
parent | 43ae7a48ae3deacf73a7a50e60f6809eed9b3f59 (diff) |
rule: print space between policy and timeout
table ip filter {
ct timeout agressive-tcp {
...
policy = { established : 100, close_wait : 4, close : 4 }
^ ^ ^ ^ ^ ^
for consistency with map syntax.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | src/rule.c | 2 | ||||
-rwxr-xr-x | tests/shell/testcases/listing/0013objects_0 | 4 | ||||
-rwxr-xr-x | tests/shell/testcases/nft-f/0017ct_timeout_obj_0 | 2 | ||||
-rw-r--r-- | tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -1760,7 +1760,7 @@ static void print_proto_timeout_policy(uint8_t l4, const uint32_t *timeout, if (timeout[i] != timeout_protocol[l4].dflt_timeout[i]) { if (comma) nft_print(octx, ", "); - nft_print(octx, "%s: %u", + nft_print(octx, "%s : %u", timeout_protocol[l4].state_to_name[i], timeout[i]); comma = true; diff --git a/tests/shell/testcases/listing/0013objects_0 b/tests/shell/testcases/listing/0013objects_0 index a73642c7..da782a68 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 { @@ -28,7 +28,7 @@ $NFT add table test $NFT add chain test input $NFT add quota test https-quota 25 mbytes $NFT add ct helper test cthelp { type \"sip\" protocol tcp \; } -$NFT add ct timeout test cttime { protocol udp \; policy = {replied: 12, unreplied: 15 } \; } +$NFT add ct timeout test cttime { protocol udp \; policy = {replied : 12, unreplied : 15 } \; } $NFT add table test-ip GET="$($NFT list table test)" diff --git a/tests/shell/testcases/nft-f/0017ct_timeout_obj_0 b/tests/shell/testcases/nft-f/0017ct_timeout_obj_0 index 3e0a7684..1d6a0f7c 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 1638b97d..7cff1ed5 100644 --- 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 { |