json: Support maps with concatenated data

commit c56d77cc82988391ab8f2514214c0088cbc7d89e upstream.

Dump such maps with an array of types in "map" property, make the parser
aware of this.

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

diff --git a/src/json.c b/src/json.c
index 67ef95b655137ba23d6926807f346fe4a8f24b2c..7e2bf433f39dddef098a226fa573eb3b10a1113d 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -120,15 +120,15 @@ static json_t *set_stmt_list_json(const struct list_head *stmt_list,
 
 static json_t *set_print_json(struct output_ctx *octx, const struct set *set)
 {
-       json_t *root, *tmp;
-       const char *type, *datatype_ext = NULL;
+       json_t *root, *tmp, *datatype_ext = NULL;
+       const char *type;
 
        if (set_is_datamap(set->flags)) {
                type = "map";
-               datatype_ext = set->data->dtype->name;
+               datatype_ext = set_dtype_json(set->data);
        } else if (set_is_objmap(set->flags)) {
                type = "map";
-               datatype_ext = obj_type_name(set->objtype);
+               datatype_ext = json_string(obj_type_name(set->objtype));
        } else if (set_is_meter(set->flags)) {
                type = "meter";
        } else {
@@ -145,7 +145,7 @@ static json_t *set_print_json(struct output_ctx *octx, const struct set *set)
        if (set->comment)
                json_object_set_new(root, "comment", json_string(set->comment));
        if (datatype_ext)
-               json_object_set_new(root, "map", json_string(datatype_ext));
+               json_object_set_new(root, "map", datatype_ext);
 
        if (!(set->flags & (NFT_SET_CONSTANT))) {
                if (set->policy != NFT_SET_POL_PERFORMANCE) {

diff --git a/src/parser_json.c b/src/parser_json.c
index 0cee632077d92922d0cf4ab8531eb62140d0ac44..207af5764aa6591d9e2412796bf4751567dcdb00 100644 (file)
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -3162,7 +3162,7 @@ static struct cmd *json_parse_cmd_add_set(struct json_ctx *ctx, json_t *root,
                                          enum cmd_ops op, enum cmd_obj obj)
 {
        struct handle h = { 0 };
-       const char *family = "", *policy, *dtype_ext = NULL;
+       const char *family = "", *policy;
        json_t *tmp, *stmt_json;
        struct set *set;
 
@@ -3213,19 +3213,19 @@ static struct cmd *json_parse_cmd_add_set(struct json_ctx *ctx, json_t *root,
                return NULL;
        }
 
-       if (!json_unpack(root, "{s:s}", "map", &dtype_ext)) {
-               const struct datatype *dtype;
+       if (!json_unpack(root, "{s:o}", "map", &tmp)) {
+               if (json_is_string(tmp)) {
+                       const char *s = json_string_value(tmp);
 
-               set->objtype = string_to_nft_object(dtype_ext);
+                       set->objtype = string_to_nft_object(s);
+               }
                if (set->objtype) {
                        set->flags |= NFT_SET_OBJECT;
-               } else if ((dtype = datatype_lookup_byname(dtype_ext))) {
-                       set->data = constant_expr_alloc(&netlink_location,
-                                                       dtype, dtype->byteorder,
-                                                       dtype->size, NULL);
+               } else if ((set->data = json_parse_dtype_expr(ctx, tmp))) {
                        set->flags |= NFT_SET_MAP;
                } else {
-                       json_error(ctx, "Invalid map type '%s'.", dtype_ext);
+                       json_error(ctx, "Invalid map type '%s'.",
+                                  json_dumps(tmp, 0));
                        set_free(set);
                        handle_free(&h);
                        return NULL;