[nft PATCH] json: Support sets' auto-merge option

[nft PATCH] json: Support sets' auto-merge option

[Phil Sutter]

If enabled, list the option as additional attribute with boolean value.

Fixes: e70354f53e9f6 ("libnftables: Implement JSON output support")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 doc/libnftables-json.adoc | 8 ++++++--
 src/json.c                | 2 ++
 src/parser_json.c         | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/libnftables-json.adoc b/doc/libnftables-json.adoc
index ad3364e20816b..3948a0bad47c1 100644
--- a/doc/libnftables-json.adoc
+++ b/doc/libnftables-json.adoc
@@ -312,7 +312,8 @@ ____
 	"elem":* 'SET_ELEMENTS'*,
 	"timeout":* 'NUMBER'*,
 	"gc-interval":* 'NUMBER'*,
-	"size":* 'NUMBER'
+	"size":* 'NUMBER'*,
+	"auto-merge":* 'BOOLEAN'
 *}}*
 
 *{ "map": {
@@ -327,7 +328,8 @@ ____
 	"elem":* 'SET_ELEMENTS'*,
 	"timeout":* 'NUMBER'*,
 	"gc-interval":* 'NUMBER'*,
-	"size":* 'NUMBER'
+	"size":* 'NUMBER'*,
+	"auto-merge":* 'BOOLEAN'
 *}}*
 
 'SET_TYPE' := 'STRING' | *[* 'SET_TYPE_LIST' *]*
@@ -366,6 +368,8 @@ that they translate a unique key to a value.
 	Garbage collector interval in seconds.
 *size*::
 	Maximum number of elements supported.
+*auto-merge*::
+	Automatic merging of adjacent/overlapping set elements in interval sets.
 
 ==== TYPE
 The set type might be a string, such as *"ipv4_addr"* or an array
diff --git a/src/json.c b/src/json.c
index 6809cd50f0a87..b3e1e4e14a5f9 100644
--- a/src/json.c
+++ b/src/json.c
@@ -194,6 +194,8 @@ static json_t *set_print_json(struct output_ctx *octx, const struct set *set)
 		tmp = json_pack("i", set->gc_int / 1000);
 		json_object_set_new(root, "gc-interval", tmp);
 	}
+	if (set->automerge)
+		json_object_set_new(root, "auto-merge", json_true());
 
 	if (!nft_output_terse(octx) && set->init && set->init->size > 0) {
 		json_t *array = json_array();
diff --git a/src/parser_json.c b/src/parser_json.c
index f4eccc1788f8a..82f20cd6ddd4e 100644
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -3420,6 +3420,7 @@ static struct cmd *json_parse_cmd_add_set(struct json_ctx *ctx, json_t *root,
 	if (!json_unpack(root, "{s:i}", "gc-interval", &set->gc_int))
 		set->gc_int *= 1000;
 	json_unpack(root, "{s:i}", "size", &set->desc.size);
+	json_unpack(root, "{s:b}", "auto-merge", &set->automerge);
 
 	if (!json_unpack(root, "{s:o}", "stmt", &stmt_json))
 		json_parse_set_stmt_list(ctx, &set->stmt_list, stmt_json);
-- 
2.43.0

Re: [nft PATCH] json: Support sets' auto-merge option

[Phil Sutter]

On Wed, Jan 31, 2024 at 05:41:20PM +0100, Phil Sutter wrote:
> If enabled, list the option as additional attribute with boolean value.
> 
> Fixes: e70354f53e9f6 ("libnftables: Implement JSON output support")
> Signed-off-by: Phil Sutter <phil@nwl.cc>

Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1734

Re: [nft PATCH] json: Support sets' auto-merge option

[Phil Sutter]

On Wed, Jan 31, 2024 at 05:41:20PM +0100, Phil Sutter wrote:
> If enabled, list the option as additional attribute with boolean value.
> 
> Fixes: e70354f53e9f6 ("libnftables: Implement JSON output support")
> Signed-off-by: Phil Sutter <phil@nwl.cc>

Patch applied after adding the missing nfbz link.