From f8ec1b7a296e6f461278937213a1477e4d29b1f3 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 18 Oct 2019 01:30:22 +0200 Subject: iptables-xml: Use add_param_to_argv() Extend the shared argv parser by storing whether a given argument was quoted or not, then use it in iptables-xml. One remaining extra bit is extraction of chain name in -A commands, do that afterwards in a loop. Signed-off-by: Phil Sutter Acked-by: Florian Westphal --- .../shell/testcases/ipt-save/0006iptables-xml_0 | 13 + .../testcases/ipt-save/dumps/fedora27-iptables.xml | 925 +++++++++++++++++++++ 2 files changed, 938 insertions(+) create mode 100755 iptables/tests/shell/testcases/ipt-save/0006iptables-xml_0 create mode 100644 iptables/tests/shell/testcases/ipt-save/dumps/fedora27-iptables.xml (limited to 'iptables/tests') diff --git a/iptables/tests/shell/testcases/ipt-save/0006iptables-xml_0 b/iptables/tests/shell/testcases/ipt-save/0006iptables-xml_0 new file mode 100755 index 00000000..50c0cae8 --- /dev/null +++ b/iptables/tests/shell/testcases/ipt-save/0006iptables-xml_0 @@ -0,0 +1,13 @@ +#!/bin/bash + +case "$(basename $XT_MULTI)" in + xtables-legacy-multi) + ;; + *) + echo "skip $XT_MULTI" + exit 0 + ;; +esac + +dump=$(dirname $0)/dumps/fedora27-iptables +diff -u -Z <(cat ${dump}.xml) <($XT_MULTI iptables-xml <$dump) diff --git a/iptables/tests/shell/testcases/ipt-save/dumps/fedora27-iptables.xml b/iptables/tests/shell/testcases/ipt-save/dumps/fedora27-iptables.xml new file mode 100644 index 00000000..400be032 --- /dev/null +++ b/iptables/tests/shell/testcases/ipt-save/dumps/fedora27-iptables.xml @@ -0,0 +1,925 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + virbr0 +

udp

+ + + 68 + + + + + + + + + + + + + + + + + + + + + + + + + wlp58s0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wlp58s0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

udp

+ + + 137 + + + + + netbios-ns + + + + + + + + + + + +
+ + + + + + + + virbr0 +

udp

+ + + 53 + + + + + + + + + + + + virbr0 +

tcp

+ + + 53 + + + + + + + + + + + + virbr0 +

udp

+ + + 67 + + + + + + + + + + + + virbr0 +

tcp

+ + + 67 + + + + + + + + + + + + RELATED,ESTABLISHED + + + + + + + + + + + + lo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INVALID + + + + + + + + + + + + icmp-host-prohibited + + + + + + + + + + + 192.168.122.0/24 + virbr0 + + + RELATED,ESTABLISHED + + + + + + + + + + + + 192.168.122.0/24 + virbr0 + + + + + + + + + + + + virbr0 + virbr0 + + + + + + + + + + + + virbr0 + + + + + icmp-port-unreachable + + + + + + + + + virbr0 + + + + + icmp-port-unreachable + + + + + + + + + RELATED,ESTABLISHED + + + + + + + + + + + + lo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INVALID + + + + + + + + + + + + icmp-host-prohibited + + + + + + + + + + + virbr0 +

udp

+ + + 68 + + + + + + + + + + + + + + + + + + + + + + + wlp58s0 + + + + + + + + + + + + + + + + + + + + + + + + + wlp58s0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

icmp

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wlp58s0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

icmp

+ + + + + + + + + + + + + +

udp

+ + + 137 + + + NEW + + + + + + + + + + + +

udp

+ + + 138 + + + NEW + + + + + + + + + + + +

tcp

+ + + 22 + + + NEW + + + + + + + + + + + + 224.0.0.251/32 +

udp

+ + + 5353 + + + NEW + + + + + + + + + + + +

udp

+ + + 1025:65535 + + + NEW + + + + + + + + + + + +

tcp

+ + + 1025:65535 + + + NEW + + + + + + + + + + + + + + + + + + + + + + + +
+ + -- cgit v1.2.3