From 86c691e6dedc1cfb487eb1e1651c0600cc567ea9 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 3 Mar 2022 16:57:30 +0100 Subject: [PATCH] tests: Update IPv4-in-IPv6 addresses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have couple of tests where the obsolete IPv4-in-IPv6 notation is used (::10.1.2.3). Change them to the correct format (::ffff:10.1.2.3). Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko --- tests/nwfilterxml2firewalldata/ah-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/ah-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/all-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/all-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/comment-linux.args | 4 ++-- tests/nwfilterxml2firewalldata/comment.xml | 4 ++-- tests/nwfilterxml2firewalldata/esp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/esp-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/hex-data-linux.args | 4 ++-- tests/nwfilterxml2firewalldata/hex-data.xml | 4 ++-- tests/nwfilterxml2firewalldata/icmpv6-linux.args | 2 +- tests/nwfilterxml2firewalldata/icmpv6.xml | 2 +- tests/nwfilterxml2firewalldata/ipv6-linux.args | 4 ++-- tests/nwfilterxml2firewalldata/ipv6.xml | 4 ++-- tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/sctp-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/tcp-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/udp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/udp-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/udplite-ipv6.xml | 2 +- tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/comment-test-invalid.xml | 4 ++-- tests/nwfilterxml2xmlin/esp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/hex-data-test-invalid.xml | 4 ++-- tests/nwfilterxml2xmlin/icmpv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/ipv6-test-invalid.xml | 4 ++-- tests/nwfilterxml2xmlin/sctp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlout/ah-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/all-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/comment-test.xml | 2 +- tests/nwfilterxml2xmlout/esp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/hex-data-test.xml | 2 +- tests/nwfilterxml2xmlout/icmpv6-test.xml | 2 +- tests/nwfilterxml2xmlout/ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/sctp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/tcp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/udp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/udplite-ipv6-test.xml | 2 +- 44 files changed, 67 insertions(+), 67 deletions(-) diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args index 77f0532fd2..f0bf85e8a1 100644 --- a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args @@ -71,7 +71,7 @@ ip6tables \ -w \ -A FJ-vnet0 \ -p ah \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -83,7 +83,7 @@ ip6tables \ -p ah \ -m mac \ --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 \ +--source ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -93,7 +93,7 @@ ip6tables \ -w \ -A HJ-vnet0 \ -p ah \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6.xml b/tests/nwfilterxml2firewalldata/ah-ipv6.xml index 95ebbc9e09..b664c0dfa6 100644 --- a/tests/nwfilterxml2firewalldata/ah-ipv6.xml +++ b/tests/nwfilterxml2firewalldata/ah-ipv6.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args b/tests/nwfilterxml2firewalldata/all-ipv6-linux.args index d86908663c..5eb6033c64 100644 --- a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/all-ipv6-linux.args @@ -71,7 +71,7 @@ ip6tables \ -w \ -A FJ-vnet0 \ -p all \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -83,7 +83,7 @@ ip6tables \ -p all \ -m mac \ --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 \ +--source ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -93,7 +93,7 @@ ip6tables \ -w \ -A HJ-vnet0 \ -p all \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ diff --git a/tests/nwfilterxml2firewalldata/all-ipv6.xml b/tests/nwfilterxml2firewalldata/all-ipv6.xml index 5cf3519437..5132e9bdd6 100644 --- a/tests/nwfilterxml2firewalldata/all-ipv6.xml +++ b/tests/nwfilterxml2firewalldata/all-ipv6.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2firewalldata/comment-linux.args b/tests/nwfilterxml2firewalldata/comment-linux.args index c014538f09..2b940ccd84 100644 --- a/tests/nwfilterxml2firewalldata/comment-linux.args +++ b/tests/nwfilterxml2firewalldata/comment-linux.args @@ -25,8 +25,8 @@ ebtables \ -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \ -p ipv6 \ ---ip6-source ::10.1.2.3/22 \ ---ip6-destination ::10.1.2.3/113 \ +--ip6-source ::ffff:10.1.2.3/22 \ +--ip6-destination ::ffff:10.1.2.3/113 \ --ip6-protocol 6 \ --ip6-source-port 273:400 \ --ip6-destination-port 13107:65535 \ diff --git a/tests/nwfilterxml2firewalldata/comment.xml b/tests/nwfilterxml2firewalldata/comment.xml index a154a17c14..f1d2af1908 100644 --- a/tests/nwfilterxml2firewalldata/comment.xml +++ b/tests/nwfilterxml2firewalldata/comment.xml @@ -19,8 +19,8 @@ diff --git a/tests/nwfilterxml2firewalldata/hex-data-linux.args b/tests/nwfilterxml2firewalldata/hex-data-linux.args index 3c04e1c23d..ff8f528c48 100644 --- a/tests/nwfilterxml2firewalldata/hex-data-linux.args +++ b/tests/nwfilterxml2firewalldata/hex-data-linux.args @@ -25,8 +25,8 @@ ebtables \ -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \ -p ipv6 \ ---ip6-source ::10.1.2.3/22 \ ---ip6-destination ::10.1.2.3/113 \ +--ip6-source ::ffff:10.1.2.3/22 \ +--ip6-destination ::ffff:10.1.2.3/113 \ --ip6-protocol 6 \ --ip6-source-port 273:400 \ --ip6-destination-port 13107:65535 \ diff --git a/tests/nwfilterxml2firewalldata/hex-data.xml b/tests/nwfilterxml2firewalldata/hex-data.xml index 45df45129b..ee93bbccda 100644 --- a/tests/nwfilterxml2firewalldata/hex-data.xml +++ b/tests/nwfilterxml2firewalldata/hex-data.xml @@ -19,8 +19,8 @@ diff --git a/tests/nwfilterxml2firewalldata/ipv6-linux.args b/tests/nwfilterxml2firewalldata/ipv6-linux.args index 87db9c2979..a36ae23cf5 100644 --- a/tests/nwfilterxml2firewalldata/ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/ipv6-linux.args @@ -5,8 +5,8 @@ ebtables \ -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \ -p ipv6 \ ---ip6-source ::10.1.2.3/22 \ ---ip6-destination ::10.1.2.3/113 \ +--ip6-source ::ffff:10.1.2.3/22 \ +--ip6-destination ::ffff:10.1.2.3/113 \ --ip6-protocol 17 \ --ip6-source-port 20:22 \ --ip6-destination-port 100:101 \ diff --git a/tests/nwfilterxml2firewalldata/ipv6.xml b/tests/nwfilterxml2firewalldata/ipv6.xml index 2400958030..0351bca01a 100644 --- a/tests/nwfilterxml2firewalldata/ipv6.xml +++ b/tests/nwfilterxml2firewalldata/ipv6.xml @@ -3,8 +3,8 @@ diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args index 8fa5e24eff..50b5514a3b 100644 --- a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args @@ -74,7 +74,7 @@ ip6tables \ -w \ -A FJ-vnet0 \ -p tcp \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --dport 255:256 \ @@ -88,7 +88,7 @@ ip6tables \ -p tcp \ -m mac \ --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 \ +--source ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --sport 255:256 \ @@ -100,7 +100,7 @@ ip6tables \ -w \ -A HJ-vnet0 \ -p tcp \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --dport 255:256 \ diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6.xml b/tests/nwfilterxml2firewalldata/tcp-ipv6.xml index d4f24f44de..2f41b227b3 100644 --- a/tests/nwfilterxml2firewalldata/tcp-ipv6.xml +++ b/tests/nwfilterxml2firewalldata/tcp-ipv6.xml @@ -14,7 +14,7 @@ diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args index 59367ed3d3..6feec12a04 100644 --- a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args @@ -74,7 +74,7 @@ ip6tables \ -w \ -A FJ-vnet0 \ -p udp \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --dport 255:256 \ @@ -88,7 +88,7 @@ ip6tables \ -p udp \ -m mac \ --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 \ +--source ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --sport 255:256 \ @@ -100,7 +100,7 @@ ip6tables \ -w \ -A HJ-vnet0 \ -p udp \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --dport 255:256 \ diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6.xml b/tests/nwfilterxml2firewalldata/udp-ipv6.xml index fd4f135a4b..7c0be8404e 100644 --- a/tests/nwfilterxml2firewalldata/udp-ipv6.xml +++ b/tests/nwfilterxml2firewalldata/udp-ipv6.xml @@ -14,7 +14,7 @@ diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args index de564aee36..6be6aa0069 100644 --- a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args @@ -71,7 +71,7 @@ ip6tables \ -w \ -A FJ-vnet0 \ -p udplite \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -83,7 +83,7 @@ ip6tables \ -p udplite \ -m mac \ --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 \ +--source ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -93,7 +93,7 @@ ip6tables \ -w \ -A HJ-vnet0 \ -p udplite \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6.xml b/tests/nwfilterxml2firewalldata/udplite-ipv6.xml index 5b941a2465..1b006e1d42 100644 --- a/tests/nwfilterxml2firewalldata/udplite-ipv6.xml +++ b/tests/nwfilterxml2firewalldata/udplite-ipv6.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml b/tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml index f0200985df..a5bb5e595f 100644 --- a/tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml b/tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml index 32772370a8..a162aa1c45 100644 --- a/tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2xmlin/comment-test-invalid.xml b/tests/nwfilterxml2xmlin/comment-test-invalid.xml index 69ba783ce1..c85dbadb0b 100644 --- a/tests/nwfilterxml2xmlin/comment-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/comment-test-invalid.xml @@ -19,8 +19,8 @@ diff --git a/tests/nwfilterxml2xmlin/hex-data-test-invalid.xml b/tests/nwfilterxml2xmlin/hex-data-test-invalid.xml index af26a92ae4..e6c9dc4636 100644 --- a/tests/nwfilterxml2xmlin/hex-data-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/hex-data-test-invalid.xml @@ -19,8 +19,8 @@ diff --git a/tests/nwfilterxml2xmlin/ipv6-test-invalid.xml b/tests/nwfilterxml2xmlin/ipv6-test-invalid.xml index 2daa3b96dd..3b420871b2 100644 --- a/tests/nwfilterxml2xmlin/ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/ipv6-test-invalid.xml @@ -3,8 +3,8 @@ diff --git a/tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml b/tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml index f4340f9ee8..bdc8d6ef23 100644 --- a/tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml @@ -14,7 +14,7 @@ diff --git a/tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml b/tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml index f2a73896f2..1f8be92fa0 100644 --- a/tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml @@ -14,7 +14,7 @@ diff --git a/tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml b/tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml index 2f2b8d4941..702804ba7c 100644 --- a/tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2xmlout/ah-ipv6-test.xml b/tests/nwfilterxml2xmlout/ah-ipv6-test.xml index 6d65b3de57..2c4b9c97af 100644 --- a/tests/nwfilterxml2xmlout/ah-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/ah-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/all-ipv6-test.xml b/tests/nwfilterxml2xmlout/all-ipv6-test.xml index 263a679966..226e86bead 100644 --- a/tests/nwfilterxml2xmlout/all-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/all-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/comment-test.xml b/tests/nwfilterxml2xmlout/comment-test.xml index 1d95af1c27..70779bcb23 100644 --- a/tests/nwfilterxml2xmlout/comment-test.xml +++ b/tests/nwfilterxml2xmlout/comment-test.xml @@ -7,7 +7,7 @@ - + diff --git a/tests/nwfilterxml2xmlout/esp-ipv6-test.xml b/tests/nwfilterxml2xmlout/esp-ipv6-test.xml index 3852aaca47..c8744b86d8 100644 --- a/tests/nwfilterxml2xmlout/esp-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/esp-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/hex-data-test.xml b/tests/nwfilterxml2xmlout/hex-data-test.xml index 35a125b600..98eeac7152 100644 --- a/tests/nwfilterxml2xmlout/hex-data-test.xml +++ b/tests/nwfilterxml2xmlout/hex-data-test.xml @@ -7,7 +7,7 @@ - + diff --git a/tests/nwfilterxml2xmlout/icmpv6-test.xml b/tests/nwfilterxml2xmlout/icmpv6-test.xml index 3334038a84..314aad2137 100644 --- a/tests/nwfilterxml2xmlout/icmpv6-test.xml +++ b/tests/nwfilterxml2xmlout/icmpv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/ipv6-test.xml b/tests/nwfilterxml2xmlout/ipv6-test.xml index ce9dd06233..3c5799590a 100644 --- a/tests/nwfilterxml2xmlout/ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/ipv6-test.xml @@ -1,7 +1,7 @@ 5c6d49af-b071-6127-b4ec-6f8ed4b55335 - + diff --git a/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml b/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml index 3ef8589a00..87c8487257 100644 --- a/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml b/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml index fcbe7a4a0f..0755c1b75f 100644 --- a/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/udp-ipv6-test.xml b/tests/nwfilterxml2xmlout/udp-ipv6-test.xml index abcf698169..28b1a93f4d 100644 --- a/tests/nwfilterxml2xmlout/udp-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/udp-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml b/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml index 9f41181535..308fb98e6f 100644 --- a/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml @@ -7,6 +7,6 @@ - +