rule: do not print semicolon in ct timeout

table ip filter {
        ct timeout agressive-tcp {
                protocol tcp;
                            ^--- remove this semicolon

Not needed, remove it.

Fixes: c7c94802679c ("src: add ct timeout support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/rule.c b/src/rule.c
index 048a7fb4c92c454a8227ccb05f6890f752698da1..6dbc553e6c3384d410598e7472b835fe9b86ff6b 100644 (file)
--- a/src/rule.c
+++ b/src/rule.c
@@ -1834,7 +1834,7 @@ static void obj_print_data(const struct obj *obj,
                nft_print(octx, "%s", opts->nl);
                nft_print(octx, "%s%sprotocol ", opts->tab, opts->tab);
                print_proto_name_proto(obj->ct_timeout.l4proto, octx);
-               nft_print(octx, ";%s", opts->nl);
+               nft_print(octx, "%s", opts->nl);
                nft_print(octx, "%s%sl3proto %s%s",
                          opts->tab, opts->tab,
                          family2str(obj->ct_timeout.l3proto),

diff --git a/tests/shell/testcases/listing/0013objects_0 b/tests/shell/testcases/listing/0013objects_0
index 713c783e0baa5882788e6a6b38532daf72b64924..a73642c72635f3c6a1b00afafd4a41473c20bcc4 100755 (executable)
--- a/tests/shell/testcases/listing/0013objects_0
+++ b/tests/shell/testcases/listing/0013objects_0
@@ -13,7 +13,7 @@ EXPECTED="table ip test {
        }
 
        ct timeout cttime {
-               protocol udp;
+               protocol udp
                l3proto ip
                policy = { unreplied: 15, replied: 12 }
        }

diff --git a/tests/shell/testcases/nft-f/0017ct_timeout_obj_0 b/tests/shell/testcases/nft-f/0017ct_timeout_obj_0
index 448a8207bac7dbc27e4d0c4f2d62f9af3388f61c..3e0a768487c7201fa17ef88f71060e8dbb5692b7 100755 (executable)
--- a/tests/shell/testcases/nft-f/0017ct_timeout_obj_0
+++ b/tests/shell/testcases/nft-f/0017ct_timeout_obj_0
@@ -2,7 +2,7 @@
 
 EXPECTED='table ip filter {
        ct timeout cttime{
-               protocol tcp;
+               protocol tcp
                l3proto ip
                policy = { established: 123, close: 12 }
        }

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 bca36580f9c389d2302e0fdf57419e756f67cda9..1638b97d8c6b943e5700a08d6991818a5fd833df 100644 (file)
--- a/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft
+++ b/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft
@@ -1,6 +1,6 @@
 table ip filter {
        ct timeout cttime {
-               protocol tcp;
+               protocol tcp
                l3proto ip
                policy = { established: 123, close: 12 }
        }