shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

tests: Update IPv4-in-IPv6 addresses

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2022-03-03 16:57:30 +01:00
parent c7a0b89065
commit 86c691e6de
44 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/nwfilterxml2firewalldata/ah-ipv6-linux.args
View File

@ -71,7 +71,7 @@ ip6tables \
-w \ -w \
-A FJ-vnet0 \ -A FJ-vnet0 \
-p ah \ -p ah \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \
@ -83,7 +83,7 @@ ip6tables \
-p ah \ -p ah \
-m mac \ -m mac \
--mac-source 01:02:03:04:05:06 \ --mac-source 01:02:03:04:05:06 \
--source ::10.1.2.3/128 \ --source ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \
@ -93,7 +93,7 @@ ip6tables \
-w \ -w \
-A HJ-vnet0 \ -A HJ-vnet0 \
-p ah \ -p ah \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \

2
tests/nwfilterxml2firewalldata/ah-ipv6.xml
View File

@ -13,7 +13,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<ah-ipv6 srcmacaddr='1:2:3:4:5:6' <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'/> dscp='33'/>
</rule> </rule>
</filter> </filter>

6
tests/nwfilterxml2firewalldata/all-ipv6-linux.args
View File

@ -71,7 +71,7 @@ ip6tables \
-w \ -w \
-A FJ-vnet0 \ -A FJ-vnet0 \
-p all \ -p all \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \
@ -83,7 +83,7 @@ ip6tables \
-p all \ -p all \
-m mac \ -m mac \
--mac-source 01:02:03:04:05:06 \ --mac-source 01:02:03:04:05:06 \
--source ::10.1.2.3/128 \ --source ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \
@ -93,7 +93,7 @@ ip6tables \
-w \ -w \
-A HJ-vnet0 \ -A HJ-vnet0 \
-p all \ -p all \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \

2
tests/nwfilterxml2firewalldata/all-ipv6.xml
View File

@ -13,7 +13,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<all-ipv6 srcmacaddr='1:2:3:4:5:6' <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'/> dscp='33'/>
</rule> </rule>
</filter> </filter>

4
tests/nwfilterxml2firewalldata/comment-linux.args
View File

@ -25,8 +25,8 @@ ebtables \
-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ -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 \ -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \
-p ipv6 \ -p ipv6 \
--ip6-source ::10.1.2.3/22 \ --ip6-source ::ffff:10.1.2.3/22 \
--ip6-destination ::10.1.2.3/113 \ --ip6-destination ::ffff:10.1.2.3/113 \
--ip6-protocol 6 \ --ip6-protocol 6 \
--ip6-source-port 273:400 \ --ip6-source-port 273:400 \
--ip6-destination-port 13107:65535 \ --ip6-destination-port 13107:65535 \

4
tests/nwfilterxml2firewalldata/comment.xml
View File

@ -19,8 +19,8 @@
<rule action='accept' direction='out'> <rule action='accept' direction='out'>
<ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe' <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' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
srcipaddr='::10.1.2.3' srcipmask='22' srcipaddr='::ffff:10.1.2.3' srcipmask='22'
dstipaddr='::10.1.2.3' dstipaddr='::ffff:10.1.2.3'
dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000' dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
protocol='tcp' protocol='tcp'
srcportstart='0x111' srcportend='400' srcportstart='0x111' srcportend='400'

6
tests/nwfilterxml2firewalldata/esp-ipv6-linux.args
View File

@ -71,7 +71,7 @@ ip6tables \
-w \ -w \
-A FJ-vnet0 \ -A FJ-vnet0 \
-p esp \ -p esp \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \
@ -83,7 +83,7 @@ ip6tables \
-p esp \ -p esp \
-m mac \ -m mac \
--mac-source 01:02:03:04:05:06 \ --mac-source 01:02:03:04:05:06 \
--source ::10.1.2.3/128 \ --source ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \
@ -93,7 +93,7 @@ ip6tables \
-w \ -w \
-A HJ-vnet0 \ -A HJ-vnet0 \
-p esp \ -p esp \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \

2
tests/nwfilterxml2firewalldata/esp-ipv6.xml
View File

@ -13,7 +13,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<esp-ipv6 srcmacaddr='1:2:3:4:5:6' <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'/> dscp='33'/>
</rule> </rule>
</filter> </filter>

4
tests/nwfilterxml2firewalldata/hex-data-linux.args
View File

@ -25,8 +25,8 @@ ebtables \
-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ -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 \ -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \
-p ipv6 \ -p ipv6 \
--ip6-source ::10.1.2.3/22 \ --ip6-source ::ffff:10.1.2.3/22 \
--ip6-destination ::10.1.2.3/113 \ --ip6-destination ::ffff:10.1.2.3/113 \
--ip6-protocol 6 \ --ip6-protocol 6 \
--ip6-source-port 273:400 \ --ip6-source-port 273:400 \
--ip6-destination-port 13107:65535 \ --ip6-destination-port 13107:65535 \

4
tests/nwfilterxml2firewalldata/hex-data.xml
View File

@ -19,8 +19,8 @@
<rule action='accept' direction='out'> <rule action='accept' direction='out'>
<ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe' <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' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
srcipaddr='::10.1.2.3' srcipmask='22' srcipaddr='::ffff:10.1.2.3' srcipmask='22'
dstipaddr='::10.1.2.3' dstipaddr='::ffff:10.1.2.3'
dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000' dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
protocol='tcp' protocol='tcp'
srcportstart='0x111' srcportend='400' srcportstart='0x111' srcportend='400'

2
tests/nwfilterxml2firewalldata/icmpv6-linux.args
View File

@ -45,7 +45,7 @@ ip6tables \
-p icmpv6 \ -p icmpv6 \
-m mac \ -m mac \
--mac-source 01:02:03:04:05:06 \ --mac-source 01:02:03:04:05:06 \
--source ::10.1.2.3/128 \ --source ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
--icmpv6-type 255/255 \ --icmpv6-type 255/255 \

2
tests/nwfilterxml2firewalldata/icmpv6.xml
View File

@ -13,7 +13,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<icmpv6 srcmacaddr='1:2:3:4:5:6' <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'/> dscp='33' type='255' code='255'/>
</rule> </rule>
</filter> </filter>

4
tests/nwfilterxml2firewalldata/ipv6-linux.args
View File

@ -5,8 +5,8 @@ ebtables \
-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ -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 \ -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \
-p ipv6 \ -p ipv6 \
--ip6-source ::10.1.2.3/22 \ --ip6-source ::ffff:10.1.2.3/22 \
--ip6-destination ::10.1.2.3/113 \ --ip6-destination ::ffff:10.1.2.3/113 \
--ip6-protocol 17 \ --ip6-protocol 17 \
--ip6-source-port 20:22 \ --ip6-source-port 20:22 \
--ip6-destination-port 100:101 \ --ip6-destination-port 100:101 \

4
tests/nwfilterxml2firewalldata/ipv6.xml
View File

@ -3,8 +3,8 @@
<rule action='accept' direction='out'> <rule action='accept' direction='out'>
<ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe' <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' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
srcipaddr='::10.1.2.3' srcipmask='22' srcipaddr='::ffff:10.1.2.3' srcipmask='22'
dstipaddr='::10.1.2.3' dstipaddr='::ffff:10.1.2.3'
dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000' dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
protocol='udp' protocol='udp'
srcportstart='20' srcportend='22' srcportstart='20' srcportend='22'

6
tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args
View File

@ -74,7 +74,7 @@ ip6tables \
-w \ -w \
-A FJ-vnet0 \ -A FJ-vnet0 \
-p sctp \ -p sctp \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 63 \ --dscp 63 \
--dport 255:256 \ --dport 255:256 \
@ -88,7 +88,7 @@ ip6tables \
-p sctp \ -p sctp \
-m mac \ -m mac \
--mac-source 01:02:03:04:05:06 \ --mac-source 01:02:03:04:05:06 \
--source ::10.1.2.3/128 \ --source ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 63 \ --dscp 63 \
--sport 255:256 \ --sport 255:256 \
@ -100,7 +100,7 @@ ip6tables \
-w \ -w \
-A HJ-vnet0 \ -A HJ-vnet0 \
-p sctp \ -p sctp \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 63 \ --dscp 63 \
--dport 255:256 \ --dport 255:256 \

2
tests/nwfilterxml2firewalldata/sctp-ipv6.xml
View File

@ -14,7 +14,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<sctp-ipv6 srcmacaddr='1:2:3:4:5:6' <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' dscp='63'
srcportstart='255' srcportend='256' srcportstart='255' srcportend='256'
dstportstart='65535' dstportend='65535'/> dstportstart='65535' dstportend='65535'/>

6
tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args
View File

@ -74,7 +74,7 @@ ip6tables \
-w \ -w \
-A FJ-vnet0 \ -A FJ-vnet0 \
-p tcp \ -p tcp \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 63 \ --dscp 63 \
--dport 255:256 \ --dport 255:256 \
@ -88,7 +88,7 @@ ip6tables \
-p tcp \ -p tcp \
-m mac \ -m mac \
--mac-source 01:02:03:04:05:06 \ --mac-source 01:02:03:04:05:06 \
--source ::10.1.2.3/128 \ --source ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 63 \ --dscp 63 \
--sport 255:256 \ --sport 255:256 \
@ -100,7 +100,7 @@ ip6tables \
-w \ -w \
-A HJ-vnet0 \ -A HJ-vnet0 \
-p tcp \ -p tcp \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 63 \ --dscp 63 \
--dport 255:256 \ --dport 255:256 \

2
tests/nwfilterxml2firewalldata/tcp-ipv6.xml
View File

@ -14,7 +14,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<tcp-ipv6 srcmacaddr='1:2:3:4:5:6' <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' dscp='63'
srcportstart='255' srcportend='256' srcportstart='255' srcportend='256'
dstportstart='65535' dstportend='65535'/> dstportstart='65535' dstportend='65535'/>

6
tests/nwfilterxml2firewalldata/udp-ipv6-linux.args
View File

@ -74,7 +74,7 @@ ip6tables \
-w \ -w \
-A FJ-vnet0 \ -A FJ-vnet0 \
-p udp \ -p udp \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 63 \ --dscp 63 \
--dport 255:256 \ --dport 255:256 \
@ -88,7 +88,7 @@ ip6tables \
-p udp \ -p udp \
-m mac \ -m mac \
--mac-source 01:02:03:04:05:06 \ --mac-source 01:02:03:04:05:06 \
--source ::10.1.2.3/128 \ --source ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 63 \ --dscp 63 \
--sport 255:256 \ --sport 255:256 \
@ -100,7 +100,7 @@ ip6tables \
-w \ -w \
-A HJ-vnet0 \ -A HJ-vnet0 \
-p udp \ -p udp \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 63 \ --dscp 63 \
--dport 255:256 \ --dport 255:256 \

2
tests/nwfilterxml2firewalldata/udp-ipv6.xml
View File

@ -14,7 +14,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<udp-ipv6 srcmacaddr='1:2:3:4:5:6' <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' dscp='63'
srcportstart='255' srcportend='256' srcportstart='255' srcportend='256'
dstportstart='65535' dstportend='65535'/> dstportstart='65535' dstportend='65535'/>

6
tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args
View File

@ -71,7 +71,7 @@ ip6tables \
-w \ -w \
-A FJ-vnet0 \ -A FJ-vnet0 \
-p udplite \ -p udplite \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \
@ -83,7 +83,7 @@ ip6tables \
-p udplite \ -p udplite \
-m mac \ -m mac \
--mac-source 01:02:03:04:05:06 \ --mac-source 01:02:03:04:05:06 \
--source ::10.1.2.3/128 \ --source ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \
@ -93,7 +93,7 @@ ip6tables \
-w \ -w \
-A HJ-vnet0 \ -A HJ-vnet0 \
-p udplite \ -p udplite \
--destination ::10.1.2.3/128 \ --destination ::ffff:10.1.2.3/128 \
-m dscp \ -m dscp \
--dscp 33 \ --dscp 33 \
-m state \ -m state \

2
tests/nwfilterxml2firewalldata/udplite-ipv6.xml
View File

@ -13,7 +13,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<udplite-ipv6 srcmacaddr='1:2:3:4:5:6' <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'/> dscp='33'/>
</rule> </rule>
</filter> </filter>

2
tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml
View File

@ -13,7 +13,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<ah-ipv6 srcmacaddr='1:2:3:4:5:6' <ah-ipv6 srcmacaddr='1:2:3:4:5:6'
srcipaddr='::10.1.2.3' srcipmask='129' srcipaddr='::ffff:10.1.2.3' srcipmask='129'
dscp='33'/> dscp='33'/>
</rule> </rule>
</filter> </filter>

2
tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml
View File

@ -13,7 +13,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<all-ipv6 srcmacaddr='1:2:3:4:5:6' <all-ipv6 srcmacaddr='1:2:3:4:5:6'
srcipaddr='::10.1.2.3' srcipmask='129' srcipaddr='::ffff:10.1.2.3' srcipmask='129'
dscp='33'/> dscp='33'/>
</rule> </rule>
</filter> </filter>

4
tests/nwfilterxml2xmlin/comment-test-invalid.xml
View File

@ -19,8 +19,8 @@
<rule action='accept' direction='out'> <rule action='accept' direction='out'>
<ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe' <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' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
srcipaddr='::10.1.2.3' srcipmask='22' srcipaddr='::ffff:10.1.2.3' srcipmask='22'
dstipaddr='::10.1.2.3' dstipaddr='::ffff:10.1.2.3'
dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000' dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
protocol='tcp' protocol='tcp'
srcportstart='0x111' srcportend='400' srcportstart='0x111' srcportend='400'

2
tests/nwfilterxml2xmlin/esp-ipv6-test-invalid.xml
View File

@ -13,7 +13,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<esp-ipv6 srcmacaddr='1:2:3:4:5:6' <esp-ipv6 srcmacaddr='1:2:3:4:5:6'
srcipaddr='::10.1.2.3' srcipmask='129' srcipaddr='::ffff:10.1.2.3' srcipmask='129'
dscp='33'/> dscp='33'/>
</rule> </rule>
</filter> </filter>

4
tests/nwfilterxml2xmlin/hex-data-test-invalid.xml
View File

@ -19,8 +19,8 @@
<rule action='accept' direction='out'> <rule action='accept' direction='out'>
<ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe' <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' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
srcipaddr='::10.1.2.3' srcipmask='22' srcipaddr='::ffff:10.1.2.3' srcipmask='22'
dstipaddr='::10.1.2.3' dstipaddr='::ffff:10.1.2.3'
dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000' dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
protocol='tcp' protocol='tcp'
srcportstart='0x111' srcportend='400' srcportstart='0x111' srcportend='400'

2
tests/nwfilterxml2xmlin/icmpv6-test-invalid.xml
View File

@ -13,7 +13,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<icmpv6 srcmacaddr='1:2:3:4:5:6' <icmpv6 srcmacaddr='1:2:3:4:5:6'
srcipaddr='::10.1.2.3' srcipmask='129' srcipaddr='::ffff:10.1.2.3' srcipmask='129'
dscp='33' type='256' code='256'/> dscp='33' type='256' code='256'/>
</rule> </rule>
</filter> </filter>

4
tests/nwfilterxml2xmlin/ipv6-test-invalid.xml
View File

@ -3,8 +3,8 @@
<rule action='accept' direction='out'> <rule action='accept' direction='out'>
<ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe' <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' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
srcipaddr='::10.1.2.3' srcipmask='22' srcipaddr='::ffff:10.1.2.3' srcipmask='22'
dstipaddr='::10.1.2.3' dstipaddr='::ffff:10.1.2.3'
dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000' dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
protocol='udp' protocol='udp'
srcportstart='20' srcportend='22' srcportstart='20' srcportend='22'

2
tests/nwfilterxml2xmlin/sctp-ipv6-test-invalid.xml
View File

@ -14,7 +14,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<sctp-ipv6 srcmacaddr='1:2:3:4:5:6' <sctp-ipv6 srcmacaddr='1:2:3:4:5:6'
srcipaddr='::10.1.2.3' srcipmask='129' srcipaddr='::ffff:10.1.2.3' srcipmask='129'
dscp='63' dscp='63'
srcportstart='255' srcportend='256' srcportstart='255' srcportend='256'
dstportstart='65535' dstportend='65536'/> dstportstart='65535' dstportend='65536'/>

2
tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml
View File

@ -14,7 +14,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<tcp-ipv6 srcmacaddr='1:2:3:4:5:6' <tcp-ipv6 srcmacaddr='1:2:3:4:5:6'
srcipaddr='::10.1.2.3' srcipmask='129' srcipaddr='::ffff:10.1.2.3' srcipmask='129'
dscp='63' dscp='63'
srcportstart='255' srcportend='256' srcportstart='255' srcportend='256'
dstportstart='65535' dstportend='65536'/> dstportstart='65535' dstportend='65536'/>

2
tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml
View File

@ -14,7 +14,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<udp-ipv6 srcmacaddr='1:2:3:4:5:6' <udp-ipv6 srcmacaddr='1:2:3:4:5:6'
srcipaddr='::10.1.2.3' srcipmask='129' srcipaddr='::ffff:10.1.2.3' srcipmask='129'
dscp='63' dscp='63'
srcportstart='255' srcportend='256' srcportstart='255' srcportend='256'
dstportstart='65535' dstportend='65536'/> dstportstart='65535' dstportend='65536'/>

2
tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml
View File

@ -13,7 +13,7 @@
</rule> </rule>
<rule action='accept' direction='in'> <rule action='accept' direction='in'>
<udplite-ipv6 srcmacaddr='1:2:3:4:5:6' <udplite-ipv6 srcmacaddr='1:2:3:4:5:6'
srcipaddr='::10.1.2.3' srcipmask='129' srcipaddr='::ffff:10.1.2.3' srcipmask='129'
dscp='33'/> dscp='33'/>
</rule> </rule>
</filter> </filter>

2
tests/nwfilterxml2xmlout/ah-ipv6-test.xml
View File

@ -7,6 +7,6 @@
<ah-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/> <ah-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
</rule> </rule>
<rule action='accept' direction='in' priority='500'> <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> </rule>
</filter> </filter>

2
tests/nwfilterxml2xmlout/all-ipv6-test.xml
View File

@ -7,6 +7,6 @@
<all-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/> <all-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
</rule> </rule>
<rule action='accept' direction='in' priority='500'> <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> </rule>
</filter> </filter>

2
tests/nwfilterxml2xmlout/comment-test.xml
View File

@ -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'/> <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>
<rule action='accept' direction='out' priority='500'> <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>
<rule action='accept' direction='out' priority='500'> <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'/> <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'/>

2
tests/nwfilterxml2xmlout/esp-ipv6-test.xml
View File

@ -7,6 +7,6 @@
<esp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/> <esp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
</rule> </rule>
<rule action='accept' direction='in' priority='500'> <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> </rule>
</filter> </filter>

2
tests/nwfilterxml2xmlout/hex-data-test.xml
View File

@ -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'/> <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>
<rule action='accept' direction='out' priority='500'> <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>
<rule action='accept' direction='out' priority='500'> <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'/> <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'/>

2
tests/nwfilterxml2xmlout/icmpv6-test.xml
View File

@ -7,6 +7,6 @@
<icmpv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33' type='255' code='255'/> <icmpv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33' type='255' code='255'/>
</rule> </rule>
<rule action='accept' direction='in' priority='500'> <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> </rule>
</filter> </filter>

2
tests/nwfilterxml2xmlout/ipv6-test.xml
View File

@ -1,7 +1,7 @@
<filter name='testcase' chain='root'> <filter name='testcase' chain='root'>
<uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid>
<rule action='accept' direction='out' priority='500'> <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>
<rule action='accept' direction='inout' priority='500'> <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'/> <ipv6 srcipaddr='1::2' srcipmask='128' dstipaddr='a:b:c::' dstipmask='65' protocol='tcp' srcportstart='20' srcportend='22' dstportstart='100' dstportend='101'/>

2
tests/nwfilterxml2xmlout/sctp-ipv6-test.xml
View File

@ -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'/> <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>
<rule action='accept' direction='in' priority='500'> <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> </rule>
</filter> </filter>

2
tests/nwfilterxml2xmlout/tcp-ipv6-test.xml
View File

@ -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'/> <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>
<rule action='accept' direction='in' priority='500'> <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> </rule>
</filter> </filter>

2
tests/nwfilterxml2xmlout/udp-ipv6-test.xml
View File

@ -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'/> <udp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipmask='128' dscp='33' srcportstart='20' srcportend='21' dstportstart='100' dstportend='1111'/>
</rule> </rule>
<rule action='accept' direction='in' priority='500'> <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> </rule>
</filter> </filter>

2
tests/nwfilterxml2xmlout/udplite-ipv6-test.xml
View File

@ -7,6 +7,6 @@
<udplite-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/> <udplite-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
</rule> </rule>
<rule action='accept' direction='in' priority='500'> <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> </rule>
</filter> </filter>