parser: json: Support for synproxy objects

Parsing code was there already, merely the entry in json_parse_cmd_add()
missing.

To support maps with synproxy target, an entry in string_to_nft_object()
is required. While being at it, add other missing entries as well.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/src/parser_json.c b/src/parser_json.c
index bb027448319c5228231c05cf8ab25ad3c87c8c67..4fc0479cf4972caafed2b04ac239ce343514ac97 100644 (file)
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -3217,14 +3217,18 @@ static struct cmd *json_parse_cmd_add_rule(struct json_ctx *ctx, json_t *root,
 static int string_to_nft_object(const char *str)
 {
        const char *obj_tbl[__NFT_OBJECT_MAX] = {
-               [NFT_OBJECT_COUNTER] = "counter",
-               [NFT_OBJECT_QUOTA] = "quota",
-               [NFT_OBJECT_LIMIT] = "limit",
-               [NFT_OBJECT_SECMARK] = "secmark",
+               [NFT_OBJECT_COUNTER]    = "counter",
+               [NFT_OBJECT_QUOTA]      = "quota",
+               [NFT_OBJECT_CT_HELPER]  = "ct helper",
+               [NFT_OBJECT_LIMIT]      = "limit",
+               [NFT_OBJECT_CT_TIMEOUT] = "ct timeout",
+               [NFT_OBJECT_SECMARK]    = "secmark",
+               [NFT_OBJECT_CT_EXPECT]  = "ct expectation",
+               [NFT_OBJECT_SYNPROXY]   = "synproxy",
        };
        unsigned int i;
 
-       for (i = 0; i < NFT_OBJECT_MAX; i++) {
+       for (i = 0; i <= NFT_OBJECT_MAX; i++) {
                if (obj_tbl[i] && !strcmp(str, obj_tbl[i]))
                        return i;
        }
@@ -3759,7 +3763,8 @@ static struct cmd *json_parse_cmd_add(struct json_ctx *ctx,
                { "ct timeout", NFT_OBJECT_CT_TIMEOUT, json_parse_cmd_add_object },
                { "ct expectation", NFT_OBJECT_CT_EXPECT, json_parse_cmd_add_object },
                { "limit", CMD_OBJ_LIMIT, json_parse_cmd_add_object },
-               { "secmark", CMD_OBJ_SECMARK, json_parse_cmd_add_object }
+               { "secmark", CMD_OBJ_SECMARK, json_parse_cmd_add_object },
+               { "synproxy", CMD_OBJ_SYNPROXY, json_parse_cmd_add_object }
        };
        unsigned int i;
        json_t *tmp;