objref: Use "ct helper" for NFT_OBJECT_CT_HELPER

Change name of NFT_OBJECT_CT_HELPER in objref_type table to "ct helper"
for consistency. Note that this is not used in regular nft output since
objref_stmt_print() treats this object type separately.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/parser_json.c b/src/parser_json.c
index 88a69493ab7d3cf111491ffaf4a39a9b23e9bb51..f872977f5bcb4b018f6cdd1c8059337cd9a5e92f 100644 (file)
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -2109,7 +2109,7 @@ static struct stmt *json_parse_stmt(struct json_ctx *ctx, json_t *root)
                { "reject", json_parse_reject_stmt },
                { "set", json_parse_set_stmt },
                { "log", json_parse_log_stmt },
-               { "cthelper", json_parse_cthelper_stmt },
+               { "ct helper", json_parse_cthelper_stmt },
                { "meter", json_parse_meter_stmt },
                { "queue", json_parse_queue_stmt },
        };

diff --git a/src/statement.c b/src/statement.c
index ac151737cade1b8d81fe632590512a1a19afce81..ff4c8eb610ac1c696664e8ca51e007d181f33542 100644 (file)
--- a/src/statement.c
+++ b/src/statement.c
@@ -179,7 +179,7 @@ struct stmt *counter_stmt_alloc(const struct location *loc)
 static const char *objref_type[NFT_OBJECT_MAX + 1] = {
        [NFT_OBJECT_COUNTER]    = "counter",
        [NFT_OBJECT_QUOTA]      = "quota",
-       [NFT_OBJECT_CT_HELPER]  = "cthelper",
+       [NFT_OBJECT_CT_HELPER]  = "ct helper",
        [NFT_OBJECT_LIMIT]      = "limit",
 };
 

diff --git a/tests/py/ip/objects.t.json b/tests/py/ip/objects.t.json
index c83cc6a47c6e761c8d28c171d87644504ed361af..77c6886842b272b9c9556af2ed06467d0d49d837 100644 (file)
--- a/tests/py/ip/objects.t.json
+++ b/tests/py/ip/objects.t.json
@@ -101,14 +101,14 @@
 # ct helper set "cthelp1"
 [
     {
-        "cthelper": "cthelp1"
+        "ct helper": "cthelp1"
     }
 ]
 
 # ct helper set tcp dport map {21 : "cthelp1", 2121 : "cthelp1" }
 [
     {
-        "cthelper": {
+        "ct helper": {
             "map": {
                 "left": {
                     "payload": {