diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-11-23 10:36:50 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-11-23 11:54:50 +0100 |
| commit | 4dfb5b2010917da3f9f11c83931069931a7d6fb3 (patch) | |
| tree | 992eebd0976b9c732c71275aba770c7db081e0a5 /tests/shell/testcases/chains/dumps/0042chain_variable_0.json-nft | |
| parent | faa6908fad6053ae9549c45b88d0402cc69cf1ed (diff) | |
json: deal appropriately with multidevice in chain
Chain device support is broken in JSON: listing does not include devices
and parser only deals with one single device.
Use existing json_parse_flowtable_devs() function, rename it to
json_parse_devs() to parse the device array.
Use the dev_array that contains the device names (as string) for the
listing.
Update incorrect .json-nft files in tests/shell.
Fixes: 3fdc7541fba0 ("src: add multidevice support for netdev chain")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/shell/testcases/chains/dumps/0042chain_variable_0.json-nft')
| -rw-r--r-- | tests/shell/testcases/chains/dumps/0042chain_variable_0.json-nft | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/shell/testcases/chains/dumps/0042chain_variable_0.json-nft b/tests/shell/testcases/chains/dumps/0042chain_variable_0.json-nft index 7f0134a0..e39f7ff7 100644 --- a/tests/shell/testcases/chains/dumps/0042chain_variable_0.json-nft +++ b/tests/shell/testcases/chains/dumps/0042chain_variable_0.json-nft @@ -1 +1 @@ -{"nftables": [{"metainfo": {"version": "VERSION", "release_name": "RELEASE_NAME", "json_schema_version": 1}}, {"table": {"family": "netdev", "name": "filter1", "handle": 0}}, {"chain": {"family": "netdev", "table": "filter1", "name": "Main_Ingress1", "handle": 0, "type": "filter", "hook": "ingress", "prio": -500, "policy": "accept"}}, {"table": {"family": "netdev", "name": "filter2", "handle": 0}}, {"chain": {"family": "netdev", "table": "filter2", "name": "Main_Ingress2", "handle": 0, "type": "filter", "hook": "ingress", "prio": -500, "policy": "accept"}}, {"table": {"family": "netdev", "name": "filter3", "handle": 0}}, {"chain": {"family": "netdev", "table": "filter3", "name": "Main_Ingress3", "handle": 0, "type": "filter", "hook": "ingress", "prio": -500, "policy": "accept"}}, {"chain": {"family": "netdev", "table": "filter3", "name": "Main_Egress3", "handle": 0, "type": "filter", "hook": "egress", "prio": -500, "policy": "accept"}}]} +{"nftables": [{"metainfo": {"version": "VERSION", "release_name": "RELEASE_NAME", "json_schema_version": 1}}, {"table": {"family": "netdev", "name": "filter1", "handle": 0}}, {"chain": {"family": "netdev", "table": "filter1", "name": "Main_Ingress1", "handle": 0, "dev": "lo", "type": "filter", "hook": "ingress", "prio": -500, "policy": "accept"}}, {"table": {"family": "netdev", "name": "filter2", "handle": 0}}, {"chain": {"family": "netdev", "table": "filter2", "name": "Main_Ingress2", "handle": 0, "dev": ["d23456789012345", "lo"], "type": "filter", "hook": "ingress", "prio": -500, "policy": "accept"}}, {"table": {"family": "netdev", "name": "filter3", "handle": 0}}, {"chain": {"family": "netdev", "table": "filter3", "name": "Main_Ingress3", "handle": 0, "dev": ["d23456789012345", "lo"], "type": "filter", "hook": "ingress", "prio": -500, "policy": "accept"}}, {"chain": {"family": "netdev", "table": "filter3", "name": "Main_Egress3", "handle": 0, "dev": "lo", "type": "filter", "hook": "egress", "prio": -500, "policy": "accept"}}]} |