]> git.ipfire.org Git - thirdparty/nftables.git/commit
json: Print single set flag as non-array
authorPhil Sutter <phil@nwl.cc>
Thu, 8 May 2025 14:39:24 +0000 (16:39 +0200)
committerPhil Sutter <phil@nwl.cc>
Tue, 13 May 2025 08:48:53 +0000 (10:48 +0200)
commit6bedb12af1658562f277ca68d74cf1e9e7433a08
treed71175d9428fd39992b5625d76f2bdfb9da245c9
parent1b3c33a7931967fb7afe4efdf68deb7781786489
json: Print single set flag as non-array

The code obviously intended to do this already but got the array length
check wrong.

Fixes: e70354f53e9f6 ("libnftables: Implement JSON output support")
Signed-off-by: Phil Sutter <phil@nwl.cc>
73 files changed:
src/json.c
tests/shell/testcases/cache/dumps/0002_interval_0.json-nft
tests/shell/testcases/json/dumps/0001set_statements_0.json-nft
tests/shell/testcases/listing/dumps/0010sets_0.json-nft
tests/shell/testcases/listing/dumps/0012sets_0.json-nft
tests/shell/testcases/listing/dumps/0022terse_0.json-nft
tests/shell/testcases/maps/dumps/0005interval_map_add_many_elements_0.json-nft
tests/shell/testcases/maps/dumps/0006interval_map_overlap_0.json-nft
tests/shell/testcases/maps/dumps/0008interval_map_delete_0.json-nft
tests/shell/testcases/maps/dumps/0012map_concat_0.json-nft
tests/shell/testcases/maps/dumps/0013map_0.json-nft
tests/shell/testcases/maps/dumps/map_with_flags_0.json-nft
tests/shell/testcases/maps/dumps/named_limits.json-nft
tests/shell/testcases/maps/dumps/pipapo_double_flush.json-nft
tests/shell/testcases/maps/dumps/typeof_maps_add_delete.json-nft
tests/shell/testcases/maps/dumps/typeof_maps_update_0.json-nft
tests/shell/testcases/maps/dumps/vmap_timeout.json-nft
tests/shell/testcases/nft-f/dumps/0025empty_dynset_0.json-nft
tests/shell/testcases/optimizations/dumps/merge_vmaps.json-nft
tests/shell/testcases/optimizations/dumps/skip_unsupported.json-nft
tests/shell/testcases/packetpath/dumps/set_lookups.json-nft
tests/shell/testcases/rule_management/dumps/0004replace_0.json-nft
tests/shell/testcases/rule_management/dumps/0011reset_0.json-nft
tests/shell/testcases/sets/dumps/0001named_interval_0.json-nft
tests/shell/testcases/sets/dumps/0002named_interval_automerging_0.json-nft
tests/shell/testcases/sets/dumps/0004named_interval_shadow_0.json-nft
tests/shell/testcases/sets/dumps/0005named_interval_shadow_0.json-nft
tests/shell/testcases/sets/dumps/0008comments_interval_0.json-nft
tests/shell/testcases/sets/dumps/0009comments_timeout_0.json-nft
tests/shell/testcases/sets/dumps/0015rulesetflush_0.json-nft
tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft
tests/shell/testcases/sets/dumps/0024synproxy_0.json-nft
tests/shell/testcases/sets/dumps/0027ipv6_maps_ipv4_0.json-nft
tests/shell/testcases/sets/dumps/0028autoselect_0.json-nft
tests/shell/testcases/sets/dumps/0028delete_handle_0.json-nft
tests/shell/testcases/sets/dumps/0032restore_set_simple_0.json-nft
tests/shell/testcases/sets/dumps/0033add_set_simple_flat_0.json-nft
tests/shell/testcases/sets/dumps/0034get_element_0.json-nft
tests/shell/testcases/sets/dumps/0035add_set_elements_flat_0.json-nft
tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
tests/shell/testcases/sets/dumps/0039delete_interval_0.json-nft
tests/shell/testcases/sets/dumps/0040get_host_endian_elements_0.json-nft
tests/shell/testcases/sets/dumps/0041interval_0.json-nft
tests/shell/testcases/sets/dumps/0042update_set_0.json-nft
tests/shell/testcases/sets/dumps/0043concatenated_ranges_1.json-nft
tests/shell/testcases/sets/dumps/0044interval_overlap_1.json-nft
tests/shell/testcases/sets/dumps/0049set_define_0.json-nft
tests/shell/testcases/sets/dumps/0051set_interval_counter_0.json-nft
tests/shell/testcases/sets/dumps/0052overlap_0.json-nft
tests/shell/testcases/sets/dumps/0054comments_set_0.json-nft
tests/shell/testcases/sets/dumps/0055tcpflags_0.json-nft
tests/shell/testcases/sets/dumps/0060set_multistmt_1.json-nft
tests/shell/testcases/sets/dumps/0062set_connlimit_0.json-nft
tests/shell/testcases/sets/dumps/0063set_catchall_0.json-nft
tests/shell/testcases/sets/dumps/0064map_catchall_0.json-nft
tests/shell/testcases/sets/dumps/0069interval_merge_0.json-nft
tests/shell/testcases/sets/dumps/0071unclosed_prefix_interval_0.json-nft
tests/shell/testcases/sets/dumps/0073flat_interval_set.json-nft
tests/shell/testcases/sets/dumps/0074nested_interval_set.json-nft
tests/shell/testcases/sets/dumps/concat_interval_0.json-nft
tests/shell/testcases/sets/dumps/dynset_missing.json-nft
tests/shell/testcases/sets/dumps/exact_overlap_0.json-nft
tests/shell/testcases/sets/dumps/inner_0.json-nft
tests/shell/testcases/sets/dumps/meter_set_reuse.json-nft
tests/shell/testcases/sets/dumps/range_with_same_start_end.json-nft
tests/shell/testcases/sets/dumps/set_element_timeout_updates.json-nft
tests/shell/testcases/sets/dumps/set_eval_0.json-nft
tests/shell/testcases/sets/dumps/sets_with_ifnames.json-nft
tests/shell/testcases/transactions/dumps/0037set_0.json-nft
tests/shell/testcases/transactions/dumps/0038set_0.json-nft
tests/shell/testcases/transactions/dumps/0039set_0.json-nft
tests/shell/testcases/transactions/dumps/0047set_0.json-nft
tests/shell/testcases/transactions/dumps/doubled-set.json-nft