1 Star 0 Fork 71

梓瑶/libvirt

forked from src-openEuler/libvirt 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
tests-Update-IPv4-in-IPv6-addresses.patch 26.42 KB
一键复制 编辑 原始数据 按行查看 历史
Jiangjiacheng 提交于 2023-01-04 12:02 . Backport patches from upstream
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607
From 339c987367faf9bf758633d7a54b4bbcbf54d300 Mon Sep 17 00:00:00 2001
From: xuyinghao <xuyinghao2@huawei.com>
Date: Tue, 16 Aug 2022 19:33:07 +0800
Subject: [PATCH 13/13] tests: Update IPv4-in-IPv6 addresses
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 <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
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/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 +-
33 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args
index 35c9de38b8..74e26f962f 100644
--- a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args
+++ b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args
@@ -64,7 +64,7 @@ ip6tables \
ip6tables \
-A FJ-vnet0 \
-p ah \
---destination ::10.1.2.3/128 \
+--destination ::ffff:10.1.2.3/128 \
-m dscp \
--dscp 33 \
-m state \
@@ -75,7 +75,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 \
@@ -84,7 +84,7 @@ ip6tables \
ip6tables \
-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 @@
</rule>
<rule action='accept' direction='in'>
<ah-ipv6 srcmacaddr='1:2:3:4:5:6'
- srcipaddr='::10.1.2.3' srcipmask='128'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='128'
dscp='33'/>
</rule>
</filter>
diff --git a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args b/tests/nwfilterxml2firewalldata/all-ipv6-linux.args
index 2f84c1bfea..47c459a0f9 100644
--- a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args
+++ b/tests/nwfilterxml2firewalldata/all-ipv6-linux.args
@@ -64,7 +64,7 @@ ip6tables \
ip6tables \
-A FJ-vnet0 \
-p all \
---destination ::10.1.2.3/128 \
+--destination ::ffff:10.1.2.3/128 \
-m dscp \
--dscp 33 \
-m state \
@@ -75,7 +75,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 \
@@ -84,7 +84,7 @@ ip6tables \
ip6tables \
-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 @@
</rule>
<rule action='accept' direction='in'>
<all-ipv6 srcmacaddr='1:2:3:4:5:6'
- srcipaddr='::10.1.2.3' srcipmask='128'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='128'
dscp='33'/>
</rule>
</filter>
diff --git a/tests/nwfilterxml2firewalldata/comment-linux.args b/tests/nwfilterxml2firewalldata/comment-linux.args
index 462b2e2177..815d4f1a79 100644
--- a/tests/nwfilterxml2firewalldata/comment-linux.args
+++ b/tests/nwfilterxml2firewalldata/comment-linux.args
@@ -22,8 +22,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 @@
<rule action='accept' direction='out'>
<ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe'
dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
- srcipaddr='::10.1.2.3' srcipmask='22'
- dstipaddr='::10.1.2.3'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='22'
+ dstipaddr='::ffff:10.1.2.3'
dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
protocol='tcp'
srcportstart='0x111' srcportend='400'
diff --git a/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args
index 51cf74815b..98cd0984b6 100644
--- a/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args
+++ b/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args
@@ -64,7 +64,7 @@ ip6tables \
ip6tables \
-A FJ-vnet0 \
-p esp \
---destination ::10.1.2.3/128 \
+--destination ::ffff:10.1.2.3/128 \
-m dscp \
--dscp 33 \
-m state \
@@ -75,7 +75,7 @@ ip6tables \
-p esp \
-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 \
@@ -84,7 +84,7 @@ ip6tables \
ip6tables \
-A HJ-vnet0 \
-p esp \
---destination ::10.1.2.3/128 \
+--destination ::ffff:10.1.2.3/128 \
-m dscp \
--dscp 33 \
-m state \
diff --git a/tests/nwfilterxml2firewalldata/esp-ipv6.xml b/tests/nwfilterxml2firewalldata/esp-ipv6.xml
index 295d0f9b3b..d411366c1c 100644
--- a/tests/nwfilterxml2firewalldata/esp-ipv6.xml
+++ b/tests/nwfilterxml2firewalldata/esp-ipv6.xml
@@ -13,7 +13,7 @@
</rule>
<rule action='accept' direction='in'>
<esp-ipv6 srcmacaddr='1:2:3:4:5:6'
- srcipaddr='::10.1.2.3' srcipmask='128'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='128'
dscp='33'/>
</rule>
</filter>
diff --git a/tests/nwfilterxml2firewalldata/hex-data-linux.args b/tests/nwfilterxml2firewalldata/hex-data-linux.args
index f1a1f588f2..3d22f4ed69 100644
--- a/tests/nwfilterxml2firewalldata/hex-data-linux.args
+++ b/tests/nwfilterxml2firewalldata/hex-data-linux.args
@@ -22,8 +22,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 @@
<rule action='accept' direction='out'>
<ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe'
dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
- srcipaddr='::10.1.2.3' srcipmask='22'
- dstipaddr='::10.1.2.3'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='22'
+ dstipaddr='::ffff:10.1.2.3'
dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
protocol='tcp'
srcportstart='0x111' srcportend='400'
diff --git a/tests/nwfilterxml2firewalldata/icmpv6-linux.args b/tests/nwfilterxml2firewalldata/icmpv6-linux.args
index 92190eb311..2462468ab4 100644
--- a/tests/nwfilterxml2firewalldata/icmpv6-linux.args
+++ b/tests/nwfilterxml2firewalldata/icmpv6-linux.args
@@ -41,7 +41,7 @@ ip6tables \
-p icmpv6 \
-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 \
--icmpv6-type 255/255 \
diff --git a/tests/nwfilterxml2firewalldata/icmpv6.xml b/tests/nwfilterxml2firewalldata/icmpv6.xml
index 9d248266fe..52b3a7cada 100644
--- a/tests/nwfilterxml2firewalldata/icmpv6.xml
+++ b/tests/nwfilterxml2firewalldata/icmpv6.xml
@@ -13,7 +13,7 @@
</rule>
<rule action='accept' direction='in'>
<icmpv6 srcmacaddr='1:2:3:4:5:6'
- srcipaddr='::10.1.2.3' srcipmask='128'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='128'
dscp='33' type='255' code='255'/>
</rule>
</filter>
diff --git a/tests/nwfilterxml2firewalldata/ipv6-linux.args b/tests/nwfilterxml2firewalldata/ipv6-linux.args
index 6fba19f2eb..44b84f0916 100644
--- a/tests/nwfilterxml2firewalldata/ipv6-linux.args
+++ b/tests/nwfilterxml2firewalldata/ipv6-linux.args
@@ -4,8 +4,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 @@
<rule action='accept' direction='out'>
<ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe'
dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
- srcipaddr='::10.1.2.3' srcipmask='22'
- dstipaddr='::10.1.2.3'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='22'
+ dstipaddr='::ffff:10.1.2.3'
dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
protocol='udp'
srcportstart='20' srcportend='22'
diff --git a/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args
index 959c4e8e0f..b39d3314b3 100644
--- a/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args
+++ b/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args
@@ -67,7 +67,7 @@ ip6tables \
ip6tables \
-A FJ-vnet0 \
-p sctp \
---destination ::10.1.2.3/128 \
+--destination ::ffff:10.1.2.3/128 \
-m dscp \
--dscp 63 \
--dport 255:256 \
@@ -80,7 +80,7 @@ ip6tables \
-p sctp \
-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 \
@@ -91,7 +91,7 @@ ip6tables \
ip6tables \
-A HJ-vnet0 \
-p sctp \
---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/sctp-ipv6.xml b/tests/nwfilterxml2firewalldata/sctp-ipv6.xml
index d1a57b8f93..1b870ce5d8 100644
--- a/tests/nwfilterxml2firewalldata/sctp-ipv6.xml
+++ b/tests/nwfilterxml2firewalldata/sctp-ipv6.xml
@@ -14,7 +14,7 @@
</rule>
<rule action='accept' direction='in'>
<sctp-ipv6 srcmacaddr='1:2:3:4:5:6'
- srcipaddr='::10.1.2.3' srcipmask='128'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='128'
dscp='63'
srcportstart='255' srcportend='256'
dstportstart='65535' dstportend='65535'/>
diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args
index e6f8de3fca..6d59ac31b8 100644
--- a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args
+++ b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args
@@ -67,7 +67,7 @@ ip6tables \
ip6tables \
-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 \
@@ -80,7 +80,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 \
@@ -91,7 +91,7 @@ ip6tables \
ip6tables \
-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 @@
</rule>
<rule action='accept' direction='in'>
<tcp-ipv6 srcmacaddr='1:2:3:4:5:6'
- srcipaddr='::10.1.2.3' srcipmask='128'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='128'
dscp='63'
srcportstart='255' srcportend='256'
dstportstart='65535' dstportend='65535'/>
diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args
index 9183c08753..808c44e051 100644
--- a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args
+++ b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args
@@ -67,7 +67,7 @@ ip6tables \
ip6tables \
-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 \
@@ -80,7 +80,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 \
@@ -91,7 +91,7 @@ ip6tables \
ip6tables \
-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 @@
</rule>
<rule action='accept' direction='in'>
<udp-ipv6 srcmacaddr='1:2:3:4:5:6'
- srcipaddr='::10.1.2.3' srcipmask='128'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='128'
dscp='63'
srcportstart='255' srcportend='256'
dstportstart='65535' dstportend='65535'/>
diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args
index 9eb38d7e6d..f2267996f6 100644
--- a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args
+++ b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args
@@ -64,7 +64,7 @@ ip6tables \
ip6tables \
-A FJ-vnet0 \
-p udplite \
---destination ::10.1.2.3/128 \
+--destination ::ffff:10.1.2.3/128 \
-m dscp \
--dscp 33 \
-m state \
@@ -75,7 +75,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 \
@@ -84,7 +84,7 @@ ip6tables \
ip6tables \
-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 @@
</rule>
<rule action='accept' direction='in'>
<udplite-ipv6 srcmacaddr='1:2:3:4:5:6'
- srcipaddr='::10.1.2.3' srcipmask='128'
+ srcipaddr='::ffff:10.1.2.3' srcipmask='128'
dscp='33'/>
</rule>
</filter>
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 @@
<ah-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
</rule>
<rule action='accept' direction='in' priority='500'>
- <ah-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='33'/>
+ <ah-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='33'/>
</rule>
</filter>
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 @@
<all-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
</rule>
<rule action='accept' direction='in' priority='500'>
- <all-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='33'/>
+ <all-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='33'/>
</rule>
</filter>
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 @@
<ip srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' srcipaddr='10.1.2.3' srcipmask='32' dstipaddr='10.1.2.3' dstipmask='32' protocol='udp' srcportstart='0x123' srcportend='0x234' dstportstart='0x3456' dstportend='0x4567' dscp='0x32' comment='ip rule'/>
</rule>
<rule action='accept' direction='out' priority='500'>
- <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='tcp' srcportstart='0x111' srcportend='400' dstportstart='0x3333' dstportend='65535' comment='ipv6 rule'/>
+ <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::ffff:10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='tcp' srcportstart='0x111' srcportend='400' dstportstart='0x3333' dstportend='65535' comment='ipv6 rule'/>
</rule>
<rule action='accept' direction='out' priority='500'>
<arp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='0x12' protocoltype='0x56' opcode='Request' arpsrcmacaddr='01:02:03:04:05:06' arpdstmacaddr='0a:0b:0c:0d:0e:0f' comment='arp rule'/>
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 @@
<esp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
</rule>
<rule action='accept' direction='in' priority='500'>
- <esp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='33'/>
+ <esp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='33'/>
</rule>
</filter>
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 @@
<ip srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' srcipaddr='10.1.2.3' srcipmask='32' dstipaddr='10.1.2.3' dstipmask='32' protocol='udp' srcportstart='0x123' srcportend='0x234' dstportstart='0x3456' dstportend='0x4567' dscp='0x32'/>
</rule>
<rule action='accept' direction='out' priority='500'>
- <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='tcp' srcportstart='0x111' srcportend='400' dstportstart='0x3333' dstportend='65535'/>
+ <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::ffff:10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='tcp' srcportstart='0x111' srcportend='400' dstportstart='0x3333' dstportend='65535'/>
</rule>
<rule action='accept' direction='out' priority='500'>
<arp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='0x12' protocoltype='0x56' opcode='Request' arpsrcmacaddr='01:02:03:04:05:06' arpdstmacaddr='0a:0b:0c:0d:0e:0f'/>
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 @@
<icmpv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33' type='255' code='255'/>
</rule>
<rule action='accept' direction='in' priority='500'>
- <icmpv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='33'/>
+ <icmpv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='33'/>
</rule>
</filter>
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 @@
<filter name='testcase' chain='root'>
<uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid>
<rule action='accept' direction='out' priority='500'>
- <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='udp' srcportstart='20' srcportend='22' dstportstart='100' dstportend='101'/>
+ <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::ffff:10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='udp' srcportstart='20' srcportend='22' dstportstart='100' dstportend='101'/>
</rule>
<rule action='accept' direction='inout' priority='500'>
<ipv6 srcipaddr='1::2' srcipmask='128' dstipaddr='a:b:c::' dstipmask='65' protocol='tcp' srcportstart='20' srcportend='22' dstportstart='100' dstportend='101'/>
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 @@
<sctp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33' srcportstart='20' srcportend='21' dstportstart='100' dstportend='1111'/>
</rule>
<rule action='accept' direction='in' priority='500'>
- <sctp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
+ <sctp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
</rule>
</filter>
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 @@
<tcp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33' srcportstart='20' srcportend='21' dstportstart='100' dstportend='1111'/>
</rule>
<rule action='accept' direction='in' priority='500'>
- <tcp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
+ <tcp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
</rule>
</filter>
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 @@
<udp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipmask='128' dscp='33' srcportstart='20' srcportend='21' dstportstart='100' dstportend='1111'/>
</rule>
<rule action='accept' direction='in' priority='500'>
- <udp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
+ <udp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
</rule>
</filter>
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 @@
<udplite-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
</rule>
<rule action='accept' direction='in' priority='500'>
- <udplite-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='33'/>
+ <udplite-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='33'/>
</rule>
</filter>
--
2.33.0
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/ziyao233/libvirt.git
git@gitee.com:ziyao233/libvirt.git
ziyao233
libvirt
libvirt
master

搜索帮助

0d507c66 1850385 C8b1a773 1850385