summaryrefslogtreecommitdiff
path: root/tests/ipf
diff options
context:
space:
mode:
authordarrenr <darrenr@NetBSD.org>2012-07-22 14:33:26 +0000
committerdarrenr <darrenr@NetBSD.org>2012-07-22 14:33:26 +0000
commitf3a00a1ef5af591674d9e4edf192a8705b84cfa0 (patch)
tree3ef7d791bc5b55222f3f0a74d324b7485a3f5966 /tests/ipf
parente20bd029883769849f7407af573053dd9567b098 (diff)
Merged IPFilter 5.1.2 into HEAD
Diffstat (limited to 'tests/ipf')
-rw-r--r--tests/ipf/expected/i128
-rw-r--r--tests/ipf/expected/i68
-rw-r--r--tests/ipf/expected/in1024
-rw-r--r--tests/ipf/expected/ip114
-rw-r--r--tests/ipf/expected/ip22
-rw-r--r--tests/ipf/expected/ip34
-rw-r--r--tests/ipf/expected/n11_68
-rw-r--r--tests/ipf/expected/n122
-rw-r--r--tests/ipf/expected/n12_62
-rw-r--r--tests/ipf/expected/n13_62
-rw-r--r--tests/ipf/expected/n142
-rw-r--r--tests/ipf/expected/n14_62
-rw-r--r--tests/ipf/expected/n152
-rw-r--r--tests/ipf/expected/n15_66
-rw-r--r--tests/ipf/expected/n186
-rw-r--r--tests/ipf/expected/n1_610
-rw-r--r--tests/ipf/expected/n28
-rw-r--r--tests/ipf/expected/n20128
-rw-r--r--tests/ipf/expected/n20223
-rw-r--r--tests/ipf/expected/n2_610
-rw-r--r--tests/ipf/expected/n44
-rw-r--r--tests/ipf/expected/n4_616
-rw-r--r--tests/ipf/expected/n56
-rw-r--r--tests/ipf/expected/n5_618
-rw-r--r--tests/ipf/expected/n66
-rw-r--r--tests/ipf/expected/n6_616
-rw-r--r--tests/ipf/expected/n7_66
-rw-r--r--tests/ipf/expected/n8_610
-rw-r--r--tests/ipf/expected/n9_610
-rw-r--r--tests/ipf/expected/ni112
-rw-r--r--tests/ipf/expected/ni122
-rw-r--r--tests/ipf/expected/ni52
-rw-r--r--tests/ipf/expected/p312
-rw-r--r--tests/ipf/expected/p62
-rw-r--r--tests/ipf/input/ipv6.119
-rw-r--r--tests/ipf/input/n13_68
-rw-r--r--tests/ipf/input/n14_68
-rw-r--r--tests/ipf/input/n20124
-rw-r--r--tests/ipf/input/n2027
-rw-r--r--tests/ipf/input/n8_611
-rw-r--r--tests/ipf/input/n9_68
-rw-r--r--tests/ipf/regress/i182
-rw-r--r--tests/ipf/regress/ipv6.54
-rw-r--r--tests/ipf/regress/n13_62
-rw-r--r--tests/ipf/regress/n2011
-rw-r--r--tests/ipf/regress/n2021
46 files changed, 146 insertions, 212 deletions
diff --git a/tests/ipf/expected/i12 b/tests/ipf/expected/i12
index 651f6535f83..6747d933890 100644
--- a/tests/ipf/expected/i12
+++ b/tests/ipf/expected/i12
@@ -30,10 +30,10 @@ pass in inet proto udp from 3.3.3.3/32 to 5.5.5.5/32 port = 9
pass in inet proto udp from 2.2.2.0/24 to 6.6.6.6/32 port = 9
pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 9
pass in inet from 10.10.10.10/32 to 11.11.11.11/32
-pass in from pool/101(!) to hash/202(!)
-pass in from hash/303(!) to pool/404(!)
+pass in from pool/101 to hash/202
+pass in from hash/303 to pool/404
table role=ipf type=tree number=
- { ! 1.1.1.1/32; 2.2.2.2/32; ! 2.2.0.0/16; };
+ { ! 2.2.0.0/16; 2.2.2.2/32; ! 1.1.1.1/32; };
table role=ipf type=tree number=
{ 1.1.0.0/16; };
-pass in from pool/0(!) to pool/0(!)
+pass in from pool/0 to pool/0
diff --git a/tests/ipf/expected/i6 b/tests/ipf/expected/i6
index d5787b256da..29c33a265f3 100644
--- a/tests/ipf/expected/i6
+++ b/tests/ipf/expected/i6
@@ -1,12 +1,12 @@
pass in on lo0(!) fastroute from any to any
pass in on lo0(!) to qe0(!) inet from 127.0.0.1/32 to 127.0.0.1/32
-pass in on le0(!) to qe0(!):127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on le0(!) to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
pass in on lo0(!) dup-to qe0(!) inet from 127.0.0.1/32 to 127.0.0.1/32
-pass in on le0(!) dup-to qe0(!):127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
-pass in on le0(!) dup-to qe0(!):127.0.0.1 to hme0(!):10.1.1.1 inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on le0(!) dup-to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on le0(!) to hme0:10.1.1.1 dup-to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
block in quick on qe0(!) to qe1(!) from any to any
block in quick to qe1(!) from any to any
pass out quick dup-to hme0(!) from any to any
pass out quick on hme0(!) reply-to hme1(!) from any to any
-pass in on le0(!) dup-to qe0(!):127.0.0.1 reply-to hme1(!):10.10.10.10 inet all
+pass in on le0(!) dup-to qe0:127.0.0.1 reply-to hme1:10.10.10.10 inet all
pass in quick fastroute all
diff --git a/tests/ipf/expected/in102 b/tests/ipf/expected/in102
index ee4df924a5f..0a1b612d2f7 100644
--- a/tests/ipf/expected/in102
+++ b/tests/ipf/expected/in102
@@ -1,5 +1,5 @@
rewrite in on bge0 proto tcp from 0/0 to 0/0 -> src 0/0 dst dstlist/a;
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 0/0 -> src 0/0 dst dstlist/bee;
rewrite in on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 0/0 dst dstlist/cat;
-rewrite in on bge0 proto tcp from pool/a(!) to 2.2.2.2/32 -> src 0/0 dst dstlist/bat;
-rewrite in on bge0 proto tcp from pool/a(!) to pool/1(!) -> src 0/0 dst dstlist/ant;
+rewrite in on bge0 proto tcp from pool/a to 2.2.2.2/32 -> src 0/0 dst dstlist/bat;
+rewrite in on bge0 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant;
diff --git a/tests/ipf/expected/ip1 b/tests/ipf/expected/ip1
index fbab39fe0f2..cee78319386 100644
--- a/tests/ipf/expected/ip1
+++ b/tests/ipf/expected/ip1
@@ -1,13 +1,13 @@
table role=ipf type=tree number=1
{; };
table role=ipf type=tree number=100
- { 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
-table role=ipf type=tree number=110
- { 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
-table role=ipf type=tree number=120
- { 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
-table role=ipf type=tree number=130
- { 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
+ { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+table role=nat type=tree number=110
+ { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+table role=auth type=tree number=120
+ { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+table role=count type=tree number=130
+ { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
table role=ipf type=hash number=2 size=1
{; };
table role=ipf type=hash number=200 size=5
diff --git a/tests/ipf/expected/ip2 b/tests/ipf/expected/ip2
index d5769de4d77..3de3c471fc9 100644
--- a/tests/ipf/expected/ip2
+++ b/tests/ipf/expected/ip2
@@ -1,2 +1,2 @@
table role=ipf type=tree name=letters
- { 2.2.2.0/24; ! 2.2.0.0/16; 1.1.1.1/32; };
+ { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; };
diff --git a/tests/ipf/expected/ip3 b/tests/ipf/expected/ip3
index f550596a947..48dd074a4c0 100644
--- a/tests/ipf/expected/ip3
+++ b/tests/ipf/expected/ip3
@@ -6,8 +6,8 @@ pool ipf/dstlist (name jill; policy random;)
{ 1.1.1.1; bge0:2.2.2.2; };
table role=nat type=hash name=noproxy size=3
{ 1.1.1.1/32; 2.2.2.2/32; };
-table role=ipf type=tree name=raw
- { 2.2.2.2/32; 1.1.1.1/32; };
+table role=nat type=tree name=raw
+ { 1.1.1.1/32; 2.2.2.2/32; };
pool all/dstlist (name jill; policy random;)
{ 1.1.1.1; bge0:2.2.2.2; };
table role=all type=hash name=noproxy size=3
diff --git a/tests/ipf/expected/n11_6 b/tests/ipf/expected/n11_6
index d34fcc9d453..f1c80de81ba 100644
--- a/tests/ipf/expected/n11_6
+++ b/tests/ipf/expected/n11_6
@@ -15,7 +15,7 @@
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
List of active MAP/Redirect filters:
-bimap zx0 10:1:1::1/128 -> 1::6:7:8/128
+bimap zx0 inet6 10:1:1::1/128 -> 1::6:7:8/128
List of active sessions:
BIMAP 10:1:1::1 <- -> 1::6:7:8 [10:1:1::2]
@@ -37,7 +37,7 @@ Accounting rules configured (set 1, in)
Accounting rules configured (set 1, out)
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2
-17
+16
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
@@ -53,7 +53,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
List of active MAP/Redirect filters:
-bimap zx0 10:1:1::/112 -> 10::2:2:2/128
+bimap zx0 inet6 10:1:1::/112 -> 10::2:2:2/128
List of active sessions:
BIMAP 10:1:1:: <- -> 10::2:2:2 [10::2:3:4]
@@ -94,7 +94,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:5
< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:5
List of active MAP/Redirect filters:
-bimap zx0 10:1:1::/112 -> 10::3:4:0/112
+bimap zx0 inet6 10:1:1::/112 -> 10::3:4:0/112
List of active sessions:
BIMAP 10:1:1::5 <- -> 10::3:4:5 [10:1:1::2]
diff --git a/tests/ipf/expected/n12 b/tests/ipf/expected/n12
index b6807eae412..56b3a781c9f 100644
--- a/tests/ipf/expected/n12
+++ b/tests/ipf/expected/n12
@@ -5,7 +5,7 @@
4510 0034 493b 4000 4006 6b69 c0a8 01bc c0a8 0303 2710 0017 4e33 298f f674 e02d 8010 4000 f673 0000 0101 080a 0c72 549e 2c05 b797
List of active MAP/Redirect filters:
-map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000
+map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000 sequential
List of active sessions:
MAP 192.168.126.83 4802 <- -> 192.168.1.188 10000 [192.168.3.3 23]
diff --git a/tests/ipf/expected/n12_6 b/tests/ipf/expected/n12_6
index ab136e09712..9ef040aaafd 100644
--- a/tests/ipf/expected/n12_6
+++ b/tests/ipf/expected/n12_6
@@ -5,7 +5,7 @@
6000 0000 0020 0640 c0a8 0100 0000 0000 0000 0000 0000 00bc c0a8 0300 0000 0000 0000 0000 0000 0003 2710 0017 4e33 298f f674 e02d 8010 4000 f673 0000 0101 080a 0c72 549e 2c05 b797
List of active MAP/Redirect filters:
-map le0 c0a8:7e00::/112 -> ::/128 portmap tcp/udp 10000:20000
+map le0 inet6 c0a8:7e00::/112 -> ::/128 portmap tcp/udp 10000:20000
List of active sessions:
MAP c0a8:7e00::53 4802 <- -> c0a8:100::bc 10000 [c0a8:300::3 23]
diff --git a/tests/ipf/expected/n13_6 b/tests/ipf/expected/n13_6
index 4d5ad7e1941..d3b5fe7fb99 100644
--- a/tests/ipf/expected/n13_6
+++ b/tests/ipf/expected/n13_6
@@ -3,7 +3,7 @@
> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:24 > 150.1.1.2
> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:25 > 150.1.1.1
List of active MAP/Redirect filters:
-map le0 192.168.0.0/32 -> range 203:0:1::1:23-203:0:1::3:45
+map le0 inet6 192:168:0::0/48 -> range 203:0:1::1:23-203:0:1::3:45
List of active sessions:
MAP 192.168.1.3 <- -> 203:0:1::1:25 [150.1.1.1]
diff --git a/tests/ipf/expected/n14 b/tests/ipf/expected/n14
index 014d802eb79..7b1a19ea931 100644
--- a/tests/ipf/expected/n14
+++ b/tests/ipf/expected/n14
@@ -1,7 +1,7 @@
< gre0 ip #0 40(20) 6 10.2.2.5,2000 > 10.1.1.254,80
< gre0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.1.253,80
< gre0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.1.254,80
-16
+15
List of active MAP/Redirect filters:
rdr gre0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky
diff --git a/tests/ipf/expected/n14_6 b/tests/ipf/expected/n14_6
index e8850dea123..b999ee971d8 100644
--- a/tests/ipf/expected/n14_6
+++ b/tests/ipf/expected/n14_6
@@ -3,7 +3,7 @@
< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:7,2000 > 10:1:1:0:0:0:0:254,80
< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:5,2001 > 203:0:1:0:0:0:1:1,80
List of active MAP/Redirect filters:
-rdr gre0 any port 80 -> 10:1:1::254,10:1:1::253 port 80 tcp sticky
+rdr gre0 inet6 any port 80 -> 10:1:1::254,10:1:1::253 port 80 tcp sticky
List of active sessions:
RDR 10:1:1::254 80 <- -> 203:0:1::1:1 80 [10::2:2:7 2000]
diff --git a/tests/ipf/expected/n15 b/tests/ipf/expected/n15
index 644b6419270..3889f82081d 100644
--- a/tests/ipf/expected/n15
+++ b/tests/ipf/expected/n15
@@ -1,5 +1,5 @@
< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80
-16
+15
List of active MAP/Redirect filters:
rdr le0 0/0 port 80 -> 3.3.3.3/32 port 80 tcp
diff --git a/tests/ipf/expected/n15_6 b/tests/ipf/expected/n15_6
index e626775f73c..f01b72b6805 100644
--- a/tests/ipf/expected/n15_6
+++ b/tests/ipf/expected/n15_6
@@ -1,7 +1,7 @@
< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80
-18
+16
List of active MAP/Redirect filters:
-rdr le0 any port 80 -> 3:0:3::3:3/128 port 80 tcp
+rdr le0 inet6 any port 80 -> 3:0:3::3:3/128 port 80 tcp
List of active sessions:
RDR 3:0:3::3:3 80 <- -> 5:5::5:5 80 [9:9:9::9 10011]
@@ -24,7 +24,7 @@ Accounting rules configured (set 1, out)
< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80
< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,81
List of active MAP/Redirect filters:
-rdr le0 any port 80 -> 3:0:3::3:3/128 port 80-88 tcp
+rdr le0 inet6 any port 80 -> 3:0:3::3:3/128 port 80-88 tcp
List of active sessions:
RDR 3:0:3::3:3 81 <- -> 2::2:2:2 80 [9:9:9::9 10011]
diff --git a/tests/ipf/expected/n18 b/tests/ipf/expected/n18
index 794cd084528..c51c11c9a52 100644
--- a/tests/ipf/expected/n18
+++ b/tests/ipf/expected/n18
@@ -7,7 +7,7 @@
> z0 ip #0 40(20) 6 1.1.1.1,3 > 3.3.3.3,36
> z0 ip #0 40(20) 6 1.1.1.1,4 > 3.3.3.3,37
List of active MAP/Redirect filters:
-map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1:4
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1:4 sequential
List of active sessions:
MAP 2.2.2.2 29 <- -> 1.1.1.1 4 [3.3.3.3 37]
@@ -44,7 +44,7 @@ Accounting rules configured (set 1, out)
> z0 ip #0 40(20) 6 1.1.1.1,1006 > 3.3.3.3,36
> z0 ip #0 40(20) 6 1.1.1.1,1007 > 3.3.3.3,37
List of active MAP/Redirect filters:
-map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:5000
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:5000 sequential
List of active sessions:
MAP 2.2.2.2 29 <- -> 1.1.1.1 1007 [3.3.3.3 37]
@@ -81,7 +81,7 @@ Accounting rules configured (set 1, out)
> z0 ip #0 40(20) 6 1.1.1.1,1006 > 3.3.3.3,36
> z0 ip #0 40(20) 6 1.1.1.1,1007 > 3.3.3.3,37
List of active MAP/Redirect filters:
-map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:50000
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:50000 sequential
List of active sessions:
MAP 2.2.2.2 29 <- -> 1.1.1.1 1007 [3.3.3.3 37]
diff --git a/tests/ipf/expected/n1_6 b/tests/ipf/expected/n1_6
index 271f1af3b68..347bf4aac4b 100644
--- a/tests/ipf/expected/n1_6
+++ b/tests/ipf/expected/n1_6
@@ -33,7 +33,7 @@
> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
List of active MAP/Redirect filters:
-map zx0 10:1:1::1/128 -> 10::2:2:2/128
+map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128
List of active sessions:
MAP 10:1:1::1 <- -> 10::2:2:2 [10:4:3::2]
@@ -57,7 +57,7 @@ Accounting rules configured (set 1, in)
Accounting rules configured (set 1, out)
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
-17
+16
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1026 > 10:1:1:0:0:0:0:1,1025
@@ -86,12 +86,12 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:1:1:0:0:0:0:2
-17
+16
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
List of active MAP/Redirect filters:
-map zx0 10:1:1::/112 -> 10::3:4:5/128
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128
List of active sessions:
MAP 10:1:1::3 <- -> 10::3:4:5 [10:4:3::4]
@@ -159,7 +159,7 @@ Accounting rules configured (set 1, out)
> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:4 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
List of active MAP/Redirect filters:
-map zx0 10:1:1::/112 -> 10::3:4:0/112
+map zx0 inet6 10:1:1::/112 -> 10::3:4:0/112
List of active sessions:
MAP 10:1:1::3 <- -> 10::3:4:4 [10:4:3::4]
diff --git a/tests/ipf/expected/n2 b/tests/ipf/expected/n2
index 6f98825e4a2..836608a46ad 100644
--- a/tests/ipf/expected/n2
+++ b/tests/ipf/expected/n2
@@ -18,7 +18,7 @@
< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
List of active MAP/Redirect filters:
-map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000
+map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000 sequential
List of active sessions:
MAP 10.1.1.1 1025 <- -> 10.2.2.2 10001 [10.1.1.2 1025]
@@ -61,7 +61,7 @@ Accounting rules configured (set 1, out)
< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
List of active MAP/Redirect filters:
-map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential
List of active sessions:
MAP 10.1.1.2 1025 <- -> 10.3.4.5 10000 [10.1.1.1 1025]
@@ -102,7 +102,7 @@ Accounting rules configured (set 1, out)
< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
List of active MAP/Redirect filters:
-map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000
+map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential
List of active sessions:
MAP 10.1.1.3 2003 <- -> 10.3.4.1 10008 [10.1.4.1 80]
@@ -156,7 +156,7 @@ Accounting rules configured (set 1, out)
< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.1.1.3,2000
List of active MAP/Redirect filters:
-map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential
List of active sessions:
MAP 10.1.1.3 2003 <- -> 10.3.4.5 40000 [10.1.4.1 80]
diff --git a/tests/ipf/expected/n201 b/tests/ipf/expected/n201
deleted file mode 100644
index 34ea2537ddf..00000000000
--- a/tests/ipf/expected/n201
+++ /dev/null
@@ -1,28 +0,0 @@
-4500 0054 0000 4000 ff04 10fa 0101 0101 c0a8 a801 4500 0040 7ee9 4000 4006 5879 c0a8 7103 c0a8 7101 ffdd 0017 21dd ace0 0000 0000 b002 8000 83f8 0000 0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000
-
-4500 0040 7ee9 4000 4006 5879 c0a8 7101 c0a8 7103 0017 ffdd ace0 21dd 21dd ace1 b012 8000 b529 0000 0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000
-
-4500 0054 0001 4000 ff04 10f9 0101 0101 c0a8 a801 4500 0040 7ee9 4000 4006 5879 c0a8 7103 c0a8 7101 ffdd 0017 21dd ace0 0000 0000 b002 8000 83f8 0000 0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000
-
-16
-List of active MAP/Redirect filters:
-encap out on bge0 proto tcp from 0/0 to 0/0 port = 23 -> src 1.1.1.1/32 dst 192.168.168.1/32;
-
-List of active sessions:
-ENC-MAP 192.168.168.1 0 <- -> 192.168.113.1 23 [192.168.113.3 65501]
-
-Hostmap table:
-List of active state sessions:
-List of configured pools
-List of configured hash tables
-List of groups configured (set 0)
-List of groups configured (set 1)
-Rules configured (set 0, in)
-Rules configured (set 0, out)
-Rules configured (set 1, in)
-Rules configured (set 1, out)
-Accounting rules configured (set 0, in)
-Accounting rules configured (set 0, out)
-Accounting rules configured (set 1, in)
-Accounting rules configured (set 1, out)
--------------------------------
diff --git a/tests/ipf/expected/n202 b/tests/ipf/expected/n202
deleted file mode 100644
index 33fe2eb9d8a..00000000000
--- a/tests/ipf/expected/n202
+++ /dev/null
@@ -1,23 +0,0 @@
-4500 0040 7ee9 4000 4006 5879 c0a8 7101 c0a8 7103 0017 ffdd 21dd ace0 0000 0000 b012 8000 83e8 0000 0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000
-
-List of active MAP/Redirect filters:
-encap out on bge0 proto tcp from 0/0 to 0/0 port = 23 -> src 1.1.1.1/32 dst 192.168.168.1/32;
-
-List of active sessions:
-ENC-MAP 192.168.168.1 <- -> 1.1.1.1 [192.168.168.1]
-
-Hostmap table:
-List of active state sessions:
-List of configured pools
-List of configured hash tables
-List of groups configured (set 0)
-List of groups configured (set 1)
-Rules configured (set 0, in)
-Rules configured (set 0, out)
-Rules configured (set 1, in)
-Rules configured (set 1, out)
-Accounting rules configured (set 0, in)
-Accounting rules configured (set 0, out)
-Accounting rules configured (set 1, in)
-Accounting rules configured (set 1, out)
--------------------------------
diff --git a/tests/ipf/expected/n2_6 b/tests/ipf/expected/n2_6
index f20a786d697..08abc8f5b69 100644
--- a/tests/ipf/expected/n2_6
+++ b/tests/ipf/expected/n2_6
@@ -18,7 +18,7 @@
< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
List of active MAP/Redirect filters:
-map zx0 10:1:1::1/128 -> 10::2:2:2/128 portmap tcp 10000:20000
+map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128 portmap tcp 10000:20000 sequential
List of active sessions:
MAP 10:1:1::1 1025 <- -> 10::2:2:2 10001 [10:1:1::2 1025]
@@ -61,7 +61,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
List of active MAP/Redirect filters:
-map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential
List of active sessions:
MAP 10:1:1::2 1025 <- -> 10::3:4:5 10000 [10:1:1::1 1025]
@@ -102,7 +102,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
List of active MAP/Redirect filters:
-map zx0 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000
+map zx0 inet6 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential
List of active sessions:
MAP 10:1:1::3 2003 <- -> 10::3:4:1 10008 [10:1:4::1 80]
@@ -142,7 +142,7 @@ Accounting rules configured (set 1, out)
> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
-17
+16
> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:2:0:0:0:0:1,80
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:3:0:0:0:0:1,80
@@ -156,7 +156,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:1:1:0:0:0:0:3,2000
List of active MAP/Redirect filters:
-map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential
List of active sessions:
MAP 10:1:1::3 2003 <- -> 10::3:4:5 40000 [10:1:4::1 80]
diff --git a/tests/ipf/expected/n4 b/tests/ipf/expected/n4
index 6f709b1f4e9..746ef7e1858 100644
--- a/tests/ipf/expected/n4
+++ b/tests/ipf/expected/n4
@@ -131,7 +131,7 @@ Accounting rules configured (set 1, out)
> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346
< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
-16
+15
> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345
List of active MAP/Redirect filters:
rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1/32 port 0 tcp
@@ -163,7 +163,7 @@ Accounting rules configured (set 1, out)
> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346
< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,53
> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
-16
+15
> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345
List of active MAP/Redirect filters:
rdr zx0 10.1.1.0/24 -> 10.2.2.1/32 ip
diff --git a/tests/ipf/expected/n4_6 b/tests/ipf/expected/n4_6
index 90637eeb5a3..e9a5ce34507 100644
--- a/tests/ipf/expected/n4_6
+++ b/tests/ipf/expected/n4_6
@@ -9,7 +9,7 @@
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345
List of active MAP/Redirect filters:
-rdr zx0 10:1:1::1/128 port 23 -> 10::2:2:1/128 port 10023 tcp
+rdr zx0 inet6 10:1:1::1/128 port 23 -> 10::2:2:1/128 port 10023 tcp
List of active sessions:
RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345]
@@ -40,7 +40,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345
List of active MAP/Redirect filters:
-rdr zx0 10:1:1::/112 port 23 -> 10::2:2:1/128 port 10023 tcp
+rdr zx0 inet6 10:1:1::/112 port 23 -> 10::2:2:1/128 port 10023 tcp
List of active sessions:
RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345]
@@ -71,7 +71,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345
List of active MAP/Redirect filters:
-rdr zx0 any port 23 -> 10::2:2:1/128 port 10023 tcp
+rdr zx0 inet6 any port 23 -> 10::2:2:1/128 port 10023 tcp
List of active sessions:
RDR 10::2:2:1 10023 <- -> 10:1:: 23 [10:3:3::3 12346]
@@ -103,7 +103,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345
List of active MAP/Redirect filters:
-rdr zx0 10:1:1::/112 port 53 -> 10::2:2:1/128 port 10053 udp
+rdr zx0 inet6 10:1:1::/112 port 53 -> 10::2:2:1/128 port 10053 udp
List of active sessions:
RDR 10::2:2:1 10053 <- -> 10:1:1:: 53 [10:3:3::3 12345]
@@ -131,10 +131,10 @@ Accounting rules configured (set 1, out)
> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346
< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
-18
+16
> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345
List of active MAP/Redirect filters:
-rdr zx0 10:1:1::/112 port 0 -> 10::2:2:1/128 port 0 tcp
+rdr zx0 inet6 10:1:1::/112 port 0 -> 10::2:2:1/128 port 0 tcp
List of active sessions:
RDR 10::2:2:1 53 <- -> 10:1:1::1 53 [10:3:3::3 12345]
@@ -163,10 +163,10 @@ Accounting rules configured (set 1, out)
> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346
< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53
> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
-18
+16
> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345
List of active MAP/Redirect filters:
-rdr zx0 10:1:1::/112 -> 10::2:2:1/128 ip
+rdr zx0 inet6 10:1:1::/112 -> 10::2:2:1/128 ip
List of active sessions:
RDR 10::2:2:1 53 <- -> 10:1:1:: 53 [10:3:3::3 12345]
diff --git a/tests/ipf/expected/n5 b/tests/ipf/expected/n5
index 98fdeb4675a..423bf485008 100644
--- a/tests/ipf/expected/n5
+++ b/tests/ipf/expected/n5
@@ -320,7 +320,7 @@ Accounting rules configured (set 1, out)
> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
List of active MAP/Redirect filters:
-map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential
List of active sessions:
MAP 10.1.1.2 1025 <- -> 10.3.4.5 10001 [10.3.4.5 40001]
@@ -398,7 +398,7 @@ Accounting rules configured (set 1, out)
> zx0 ip #0 40(20) 6 10.3.4.1,10012 > 10.3.4.5,40001
< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
List of active MAP/Redirect filters:
-map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000
+map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential
List of active sessions:
MAP 10.1.2.1 80 <- -> 10.3.4.1 10012 [10.3.4.5 40001]
@@ -494,7 +494,7 @@ Accounting rules configured (set 1, out)
> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
List of active MAP/Redirect filters:
-map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential
List of active sessions:
MAP 10.1.1.2 1025 <- -> 10.3.4.5 40000 [10.3.4.5 40001]
diff --git a/tests/ipf/expected/n5_6 b/tests/ipf/expected/n5_6
index 85664c2a3db..1e7bc8eff5a 100644
--- a/tests/ipf/expected/n5_6
+++ b/tests/ipf/expected/n5_6
@@ -53,7 +53,7 @@
> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
List of active MAP/Redirect filters:
-map zx0 10:1:1::1/128 -> 10::2:2:2/128
+map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128
List of active sessions:
MAP 10:1:1::1 1025 <- -> 10::2:2:2 1025 [10::3:4:5 40000]
@@ -85,7 +85,7 @@ Accounting rules configured (set 1, in)
Accounting rules configured (set 1, out)
-------------------------------
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
-17
+16
> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1026 > 10:1:1:0:0:0:0:1,1025
@@ -115,7 +115,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
-17
+16
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:2,1025
> zx0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
> zx0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:2:0:0:0:0:1
@@ -139,7 +139,7 @@ Accounting rules configured (set 1, out)
> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
List of active MAP/Redirect filters:
-map zx0 from 10:1:1::/112 to 10:1::/32 -> 10::3:4:5/128
+map zx0 inet6 from 10:1:1::/112 to 10:1::/32 -> 10::3:4:5/128
List of active sessions:
MAP 10:1:1::3 2003 <- -> 10::3:4:5 2003 [10:1:4::1 80]
@@ -232,7 +232,7 @@ Accounting rules configured (set 1, out)
> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
List of active MAP/Redirect filters:
-map zx0 from 10:1:1::/112 ! to 10:1::/32 -> 10::3:4:0/112
+map zx0 inet6 from 10:1:1::/112 ! to 10:1::/32 -> 10::3:4:0/112
List of active sessions:
MAP 10:1:1::2 1025 <- -> 10::3:4:3 1025 [10::3:4:5 40001]
@@ -320,7 +320,7 @@ Accounting rules configured (set 1, out)
> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
List of active MAP/Redirect filters:
-map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential
List of active sessions:
MAP 10:1:1::2 1025 <- -> 10::3:4:5 10001 [10::3:4:5 40001]
@@ -398,7 +398,7 @@ Accounting rules configured (set 1, out)
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10012 > 10:0:0:0:0:3:4:5,40001
< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
List of active MAP/Redirect filters:
-map zx0 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000
+map zx0 inet6 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential
List of active sessions:
MAP 10:1:2::1 80 <- -> 10::3:4:1 10012 [10::3:4:5 40001]
@@ -470,7 +470,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
-17
+16
> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:2,1025
> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1
@@ -494,7 +494,7 @@ Accounting rules configured (set 1, out)
> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
List of active MAP/Redirect filters:
-map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential
List of active sessions:
MAP 10:1:1::2 1025 <- -> 10::3:4:5 40000 [10::3:4:5 40001]
diff --git a/tests/ipf/expected/n6 b/tests/ipf/expected/n6
index 9d2458ae177..1afd94e54e4 100644
--- a/tests/ipf/expected/n6
+++ b/tests/ipf/expected/n6
@@ -34,7 +34,7 @@ Accounting rules configured (set 1, in)
Accounting rules configured (set 1, out)
-------------------------------
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023
-16
+15
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023
@@ -69,7 +69,7 @@ Accounting rules configured (set 1, in)
Accounting rules configured (set 1, out)
-------------------------------
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023
-16
+15
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23
< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23
@@ -110,7 +110,7 @@ Accounting rules configured (set 1, out)
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53
< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23
-16
+15
< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53
< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53
diff --git a/tests/ipf/expected/n6_6 b/tests/ipf/expected/n6_6
index ecf5ebc95c3..e10f9bd8f43 100644
--- a/tests/ipf/expected/n6_6
+++ b/tests/ipf/expected/n6_6
@@ -12,7 +12,7 @@
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
List of active MAP/Redirect filters:
-rdr zx0 10:1:1::1/128 port 23 -> 10::2:2:1/128 port 10023 tcp
+rdr zx0 inet6 10:1:1::1/128 port 23 -> 10::2:2:1/128 port 10023 tcp
List of active sessions:
RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345]
@@ -34,7 +34,7 @@ Accounting rules configured (set 1, in)
Accounting rules configured (set 1, out)
-------------------------------
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023
-18
+16
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023
@@ -47,7 +47,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
List of active MAP/Redirect filters:
-rdr zx0 from any to 10:1:1::/112 port = 23 -> 10::2:2:1/128 port 10023 tcp
+rdr zx0 inet6 from any to 10:1:1::/112 port = 23 -> 10::2:2:1/128 port 10023 tcp
List of active sessions:
RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345]
@@ -69,7 +69,7 @@ Accounting rules configured (set 1, in)
Accounting rules configured (set 1, out)
-------------------------------
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023
-18
+16
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23
< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,23
@@ -82,7 +82,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
List of active MAP/Redirect filters:
-rdr zx0 from 10::/32 to 10:1:1::/112 port = 23 -> 10::2:2:1/128 port 10023 tcp
+rdr zx0 inet6 from 10::/32 to 10:1:1::/112 port = 23 -> 10::2:2:1/128 port 10023 tcp
List of active sessions:
RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:2:2 12345]
@@ -110,13 +110,13 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23
-18
+16
< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
List of active MAP/Redirect filters:
-rdr zx0 from 10:3::/32 to 10:1::/32 port = 23 -> 10::2:2:1/128 port 10023 tcp
+rdr zx0 inet6 from 10:3::/32 to 10:1::/32 port = 23 -> 10::2:2:1/128 port 10023 tcp
List of active sessions:
RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345]
@@ -151,7 +151,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
List of active MAP/Redirect filters:
-rdr zx0 ! from 10::/32 to 10:1:1::/112 port = 53 -> 10::2:2:1/128 port 10053 udp
+rdr zx0 inet6 ! from 10::/32 to 10:1:1::/112 port = 53 -> 10::2:2:1/128 port 10053 udp
List of active sessions:
RDR 10::2:2:1 10053 <- -> 10:1:1:: 53 [10:3:3::3 12345]
diff --git a/tests/ipf/expected/n7_6 b/tests/ipf/expected/n7_6
index aac5f230f37..25630334147 100644
--- a/tests/ipf/expected/n7_6
+++ b/tests/ipf/expected/n7_6
@@ -8,7 +8,7 @@
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 10:1:1:0:0:0:0:4,80
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:1:1:0:0:0:0:4,80
List of active MAP/Redirect filters:
-rdr zx0 10:1:1::1/128 port 23-79 -> 10::2:2:1/128 port 10023 tcp
+rdr zx0 inet6 10:1:1::1/128 port 23-79 -> 10::2:2:1/128 port 10023 tcp
List of active sessions:
RDR 10::2:2:1 10079 <- -> 10:1:1::1 79 [10::2:3:1 1233]
@@ -40,7 +40,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 10:1:1:0:0:0:0:4,80
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:1:1:0:0:0:0:4,80
List of active MAP/Redirect filters:
-rdr zx0 10:1:1::1/128 port 23-79 -> 10::2:2:1/128 port = 10023 tcp
+rdr zx0 inet6 10:1:1::1/128 port 23-79 -> 10::2:2:1/128 port = 10023 tcp
List of active sessions:
RDR 10::2:2:1 10023 <- -> 10:1:1::1 79 [10::2:3:1 1233]
@@ -72,7 +72,7 @@ Accounting rules configured (set 1, out)
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 1:0:0:0:0:2:2:129,3128
< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:0:0:0:0:2:2:1,3128
List of active MAP/Redirect filters:
-rdr zx0 10:1:1::/112 port 80 -> 10::2:2:1,1::2:2:129 port 3128 tcp
+rdr zx0 inet6 10:1:1::/112 port 80 -> 10::2:2:1,1::2:2:129 port 3128 tcp
List of active sessions:
RDR 10::2:2:1 3128 <- -> 10:1:1::4 80 [10::2:3:1 1238]
diff --git a/tests/ipf/expected/n8_6 b/tests/ipf/expected/n8_6
index fe28d8622d6..4d08efe37e2 100644
--- a/tests/ipf/expected/n8_6
+++ b/tests/ipf/expected/n8_6
@@ -1,13 +1,13 @@
-6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0004 0004 0004 0000 0000 0000 0000 0004 8000 77df 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0004 0004 0004 0000 0000 0000 0000 0004 8000 7724 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
-6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 76df 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764d 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
-6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0004 0004 0004 0000 0000 0000 0000 0004 8000 77de 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0004 0004 0004 0000 0000 0000 0000 0004 8000 7723 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
-6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 76de 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764c 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
List of active MAP/Redirect filters:
-map icmp0 2::2:2:0/112 -> 10:10:10::/112
+map icmp0 inet6 2::2:2:0/112 -> 10:10:10::/112
List of active sessions:
MAP 2::2:2:2 <- -> 10:10:10::1 [4:4:4::4]
diff --git a/tests/ipf/expected/n9_6 b/tests/ipf/expected/n9_6
index 331c05f6bc2..134d74c9fa4 100644
--- a/tests/ipf/expected/n9_6
+++ b/tests/ipf/expected/n9_6
@@ -1,13 +1,13 @@
-6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0010 0010 0010 0000 0000 0000 0000 0001 8000 77df 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0010 0010 0010 0000 0000 0000 0000 0001 8000 772c 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
-6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 76df 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764d 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
-6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0010 0010 0010 0000 0000 0000 0000 0001 8000 77de 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0010 0010 0010 0000 0000 0000 0000 0001 8000 772b 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
-6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 76de 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764c 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
List of active MAP/Redirect filters:
-rdr icmp0 4:4:4::/112 -> 10:10:10::1/128 ip
+rdr icmp0 inet6 4:4:4::/112 -> 10:10:10::1/128 ip
List of active sessions:
RDR 10:10:10::1 <- -> 4:4:4::4 [2::2:2:2]
diff --git a/tests/ipf/expected/ni11 b/tests/ipf/expected/ni11
index 211081bb0e3..6ed8ecc8063 100644
--- a/tests/ipf/expected/ni11
+++ b/tests/ipf/expected/ni11
@@ -1,6 +1,6 @@
4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
-4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fb 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001
+4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001
4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
diff --git a/tests/ipf/expected/ni12 b/tests/ipf/expected/ni12
index 734ec52310d..590ec23087e 100644
--- a/tests/ipf/expected/ni12
+++ b/tests/ipf/expected/ni12
@@ -1,6 +1,6 @@
4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9c40 0000 0001 0000 0000 a002 16d0 3ef4 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
-4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fb 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001
+4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001
4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
diff --git a/tests/ipf/expected/ni5 b/tests/ipf/expected/ni5
index 92f55ebb3bd..14d983759f6 100644
--- a/tests/ipf/expected/ni5
+++ b/tests/ipf/expected/ni5
@@ -4,6 +4,7 @@
4500 0028 0001 4000 ff06 02ff 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 76c5 5010 269c 5aa0 0000
+ipf_p_ftp_servert_valid:i(0) < 5
4500 006f ffde 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 76c5 bd6b c9c9 5018 269c 967e 0000 3232 302d 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 7520 4e63 4654 5064 2053 6572 7665 7220 2866 7265 6520 6564 7563 6174 696f 6e61 6c20 6c69 6365 6e73 6529 2072 6561 6479 2e0d 0a
4500 0028 0002 4000 ff06 02fe 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 770c 5010 269c 5a59 0000
@@ -22,6 +23,7 @@
4500 0036 0006 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5018 269c 373f 0000 5041 5353 2061 7661 6c6f 6e40 0d0a
+ipf_p_ftp_servert_valid:i(0) < 5
4500 005f ffe2 4000 ef06 533c 96cb e002 c0a8 0103 0015 8032 3786 77ef bd6b c9e7 5018 269c 895e 0000 3233 302d 596f 7520 6172 6520 7573 6572 2023 3420 6f66 2035 3020 7369 6d75 6c74 616e 656f 7573 2075 7365 7273 2061 6c6c 6f77 6564 2e0d 0a
4500 0028 0007 4000 ff06 02f9 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7826 5010 269c 5921 0000
diff --git a/tests/ipf/expected/p3 b/tests/ipf/expected/p3
index 010858692e9..c1e03432538 100644
--- a/tests/ipf/expected/p3
+++ b/tests/ipf/expected/p3
@@ -19,17 +19,17 @@ List of active state sessions:
List of configured pools
List of configured hash tables
group-map out role=ipf number=2010 size=5
- { 5.0.0.0/8, group=2040; 4.4.0.0/16, group=2020; 2.2.2.2/32, group=2020; };
+ { 2.2.2.2/32, group=2020; 4.4.0.0/16, group=2020; 5.0.0.0/8, group=2040; };
group-map in role=ipf number=1010 size=3
- { 3.3.0.0/16, group=1030; 1.1.1.1/32, group=1020; };
+ { 1.1.1.1/32, group=1020; 3.3.0.0/16, group=1030; };
List of groups configured (set 0)
-Dev.0. Group 1020 Ref 1 Flags 0x8000
+Dev.0. Group 1020 Ref 2 Flags 0x8000
2 pass in all group 1020
-Dev.0. Group 1030 Ref 1 Flags 0x8000
+Dev.0. Group 1030 Ref 2 Flags 0x8000
2 block in all group 1030
-Dev.0. Group 2020 Ref 2 Flags 0x4000
+Dev.0. Group 2020 Ref 3 Flags 0x4000
4 pass out all group 2020
-Dev.0. Group 2040 Ref 1 Flags 0x4000
+Dev.0. Group 2040 Ref 2 Flags 0x4000
2 block out all group 2040
List of groups configured (set 1)
Rules configured (set 0, in)
diff --git a/tests/ipf/expected/p6 b/tests/ipf/expected/p6
index 1b6d493b7fc..413f94ba74b 100644
--- a/tests/ipf/expected/p6
+++ b/tests/ipf/expected/p6
@@ -8,7 +8,7 @@ Hostmap table:
List of active state sessions:
List of configured pools
table role=ipf type=tree name=microsoft
- { 131.107.0.0/16; 192.92.90.0/24; 198.105.232.0/22; 204.231.58.0/24; 204.140.77.0/24; 204.140.80.0/22; 199.60.28.0/24; 199.103.90.0/23; 199.103.122.0/24; 204.79.101.0/24; 192.237.67.0/24; 198.137.97.0/24; 204.79.135.0/24; 204.79.179.0/24; 204.79.180.0/23; 204.79.188.0/24; 204.79.7.0/24; 204.79.27.0/24; 198.180.74.0/23; 204.231.236.0/24; 205.163.63.0/24; 205.163.62.0/24; 205.163.144.0/20; 205.248.50.0/23; 205.248.72.0/24; 205.248.212.0/22; 205.248.228.0/24; 205.248.235.0/24; 204.231.76.0/24; 204.231.192.0/24; 207.78.80.0/24; 207.78.81.0/24; 207.78.82.0/24; 205.248.243.0/21; 207.117.3.0/24; 207.18.117.0/24; 208.139.27.0/24; 209.28.213.0/24; 207.209.68.0/24; 204.95.96.0/20; 207.158.93.192/27; 207.240.123.192/27; 208.26.205.0/24; 192.197.157.0/24; 204.133.231.0/24; 216.72.96.0/22; 207.229.166.152/29; 204.95.149.0/24; 209.192.213.72/29; 206.73.203.0/24; 206.73.118.0/24; 208.45.54.16/29; 208.45.54.8/29; 206.73.31.0/24; 63.161.50.128/25; 63.161.50.0/25; 207.240.8.224/28; 208.45.89.248/29; 206.182.69.0/24; 206.182.240.0/24; 206.182.241.0/24; 206.73.67.0/24; 206.182.251.0/24; 206.182.247.0/24; 206.182.236.0/24; 63.236.198.64/29; 63.236.198.152/29; 165.121.253.232/29; 63.236.170.64/29; 63.236.186.64/29; 63.236.187.104/29; 63.236.187.128/29; 63.236.187.160/29; 199.2.137.0/24; 216.222.104.224/28; 63.151.87.64/29; 64.77.82.96/29; 64.77.93.80/28; 65.52.0.0/14; 207.46.0.0/16; 204.182.144.0/20; 206.107.34.0/24; 205.240.158.0/23; 204.79.252.0/24; 64.200.211.16/28; 12.178.163.0/27; 69.44.126.80/28; 63.173.42.128/25; 12.28.108.0/25; 65.170.29.0/29; 67.132.133.96/29; 8.6.176.0/24; 63.148.123.240/29; 64.41.193.0/24; 64.85.70.32/28; 64.85.81.96/29; 64.85.81.104/29; 216.32.168.224/27; 206.79.74.32/28; 216.32.175.224/27; 216.32.180.0/22; 216.33.229.224/27; 216.33.236.0/22; 216.33.240.0/22; 216.32.240.0/22; 216.34.51.0/24; 209.1.112.0/24; 209.1.113.0/24; 209.1.15.0/24; 216.34.53.176/28; 216.35.8.224/28; 209.185.128.0/22; 65.114.175.128/27; 64.15.229.96/27; 64.15.177.0/24; 64.15.170.192/29; 209.143.238.0/24; 64.15.178.0/24; 66.35.209.120/29; 66.35.211.128/26; 66.35.208.48/28; 216.33.148.0/22; 216.35.66.88/29; 12.230.32.160/29; 12.53.124.0/27; 12.232.18.96/27; 12.190.158.0/24; 12.71.196.32/28; 209.240.192.0/19; 70.37.128.0/23; 70.37.135.0/24; 12.49.87.192/26; 74.93.205.144/29; 74.93.205.152/29; 74.93.206.64/29; 70.89.139.120/29; 206.71.119.0/24; 206.71.117.0/24; 206.71.118.0/24; 209.154.155.112/29; 65.68.62.152/29; 67.39.208.168/29; 65.242.67.0/24; 204.71.191.0/24; 63.194.155.144/29; 66.136.85.192/29; 64.124.184.72/29; 216.200.206.0/24; 63.80.93.0/25; 67.192.225.208/28; 69.74.162.0/24; 65.221.5.0/24; 65.248.85.0/24; 199.243.157.192/27; 199.243.157.112/29; 65.194.210.224/27; 208.194.139.0/24; 208.204.49.128/25; 208.205.26.0/24; 208.217.184.0/22; 208.222.172.0/24; 208.224.200.64/27; 208.229.100.0/23; 208.241.19.0/28; 208.241.19.16/28; 208.241.9.224/28; 208.244.108.0/28; 208.245.16.0/27; 208.249.17.160/28; 63.104.216.0/25; 63.69.245.0/24; 68.90.141.72/29; 63.198.123.160/29; 68.248.48.64/29; 68.248.48.72/29; 99.49.8.248/29; 65.38.172.72/29; 65.38.172.96/28; 75.149.174.16/29; 75.151.100.240/28; 64.81.8.96/27; 67.112.255.144/29; 63.240.201.176/28; 206.16.209.208/28; 63.240.195.208/28; 206.16.204.64/28; 206.16.223.0/24; 63.240.216.0/22; 63.240.220.0/22; 206.16.246.24/29; 63.240.195.192/28; 206.16.224.160/27; 67.192.39.48/28; 72.32.240.160/28; 72.32.201.152/29; 67.39.81.152/29; 69.20.127.32/29; 216.52.28.0/24; 70.42.230.0/23; 63.251.97.0/24; 67.120.132.128/29; 67.120.132.152/29; 67.120.132.192/28; };
+ { 131.107.0.0/16; 192.92.90.0/24; 198.105.232.0/22; 204.231.58.0/24; 204.140.77.0/24; 204.140.80.0/22; 199.60.28.0/24; 199.103.90.0/23; 199.103.122.0/24; 204.79.101.0/24; 192.237.67.0/24; 198.137.97.0/24; 204.79.135.0/24; 204.79.179.0/24; 204.79.180.0/23; 204.79.188.0/24; 204.79.7.0/24; 204.79.27.0/24; 198.180.74.0/23; 204.231.236.0/24; 205.163.63.0/24; 205.163.62.0/24; 205.163.144.0/20; 205.248.50.0/23; 205.248.72.0/24; 205.248.212.0/22; 205.248.228.0/24; 205.248.235.0/24; 204.231.76.0/24; 204.231.192.0/24; 207.78.80.0/24; 207.78.81.0/24; 207.78.82.0/24; 207.117.3.0/24; 207.18.117.0/24; 208.139.27.0/24; 209.28.213.0/24; 207.209.68.0/24; 204.95.96.0/20; 207.158.93.192/27; 207.240.123.192/27; 208.26.205.0/24; 192.197.157.0/24; 204.133.231.0/24; 216.72.96.0/22; 207.229.166.152/29; 204.95.149.0/24; 209.192.213.72/29; 206.73.203.0/24; 206.73.118.0/24; 208.45.54.16/29; 208.45.54.8/29; 206.73.31.0/24; 63.161.50.128/25; 63.161.50.0/25; 207.240.8.224/28; 208.45.89.248/29; 206.182.69.0/24; 206.182.240.0/24; 206.182.241.0/24; 206.73.67.0/24; 206.182.251.0/24; 206.182.247.0/24; 206.182.236.0/24; 63.236.198.64/29; 63.236.198.152/29; 165.121.253.232/29; 63.236.170.64/29; 63.236.186.64/29; 63.236.187.104/29; 63.236.187.128/29; 63.236.187.160/29; 199.2.137.0/24; 216.222.104.224/28; 63.151.87.64/29; 64.77.82.96/29; 64.77.93.80/28; 65.52.0.0/14; 207.46.0.0/16; 204.182.144.0/20; 206.107.34.0/24; 205.240.158.0/23; 204.79.252.0/24; 64.200.211.16/28; 12.178.163.0/27; 69.44.126.80/28; 63.173.42.128/25; 12.28.108.0/25; 65.170.29.0/29; 67.132.133.96/29; 8.6.176.0/24; 63.148.123.240/29; 64.41.193.0/24; 64.85.70.32/28; 64.85.81.96/29; 64.85.81.104/29; 216.32.168.224/27; 206.79.74.32/28; 216.32.175.224/27; 216.32.180.0/22; 216.33.229.224/27; 216.33.236.0/22; 216.33.240.0/22; 216.32.240.0/22; 216.34.51.0/24; 209.1.112.0/24; 209.1.113.0/24; 209.1.15.0/24; 216.34.53.176/28; 216.35.8.224/28; 209.185.128.0/22; 65.114.175.128/27; 64.15.229.96/27; 64.15.177.0/24; 64.15.170.192/29; 209.143.238.0/24; 64.15.178.0/24; 66.35.209.120/29; 66.35.211.128/26; 66.35.208.48/28; 216.33.148.0/22; 216.35.66.88/29; 12.230.32.160/29; 12.53.124.0/27; 12.232.18.96/27; 12.190.158.0/24; 12.71.196.32/28; 209.240.192.0/19; 70.37.128.0/23; 70.37.135.0/24; 12.49.87.192/26; 74.93.205.144/29; 74.93.205.152/29; 74.93.206.64/29; 70.89.139.120/29; 206.71.119.0/24; 206.71.117.0/24; 206.71.118.0/24; 209.154.155.112/29; 65.68.62.152/29; 67.39.208.168/29; 65.242.67.0/24; 204.71.191.0/24; 63.194.155.144/29; 66.136.85.192/29; 64.124.184.72/29; 216.200.206.0/24; 63.80.93.0/25; 67.192.225.208/28; 69.74.162.0/24; 65.221.5.0/24; 65.248.85.0/24; 199.243.157.192/27; 199.243.157.112/29; 65.194.210.224/27; 208.194.139.0/24; 208.204.49.128/25; 208.205.26.0/24; 208.217.184.0/22; 208.222.172.0/24; 208.224.200.64/27; 208.229.100.0/23; 208.241.19.0/28; 208.241.19.16/28; 208.241.9.224/28; 208.244.108.0/28; 208.245.16.0/27; 208.249.17.160/28; 63.104.216.0/25; 63.69.245.0/24; 68.90.141.72/29; 63.198.123.160/29; 68.248.48.64/29; 68.248.48.72/29; 99.49.8.248/29; 65.38.172.72/29; 65.38.172.96/28; 75.149.174.16/29; 75.151.100.240/28; 64.81.8.96/27; 67.112.255.144/29; 63.240.201.176/28; 206.16.209.208/28; 63.240.195.208/28; 206.16.204.64/28; 206.16.223.0/24; 63.240.216.0/22; 63.240.220.0/22; 206.16.246.24/29; 63.240.195.192/28; 206.16.224.160/27; 67.192.39.48/28; 72.32.240.160/28; 72.32.201.152/29; 67.39.81.152/29; 69.20.127.32/29; 216.52.28.0/24; 70.42.230.0/23; 63.251.97.0/24; 67.120.132.128/29; 67.120.132.152/29; 67.120.132.192/28; };
List of configured hash tables
List of groups configured (set 0)
List of groups configured (set 1)
diff --git a/tests/ipf/input/ipv6.1 b/tests/ipf/input/ipv6.1
index 9a1276b2fbf..6da8da0e4bb 100644
--- a/tests/ipf/input/ipv6.1
+++ b/tests/ipf/input/ipv6.1
@@ -1,3 +1,8 @@
+#
+# traceroute simulation
+#
+# UDP
+#
[out,gif0] 6000 0000 0018 1101
ef00 1001 2002 0001 0000 0000 0000 0070
2001 1002 3333 0001 0000 0000 0000 0001
@@ -6,10 +11,14 @@ ef00 1001 2002 0001 0000 0000 0000 0070
f4c1
0000 0344 0000 0004 f8f1 9d3c ddba 0e00
+#
+# ICMPV6
+# - Time exceeded
+#
[in,gif0] 6000 0000 0048 3a40
ef00 1001 0880 6cbf 0000 0000 0000 0001
ef00 1001 2002 0001 0000 0000 0000 0070
-0300 8ca9 0000 0000
+0300 f86f 0000 0000
6000 0000 0018 1101
ef00 1001 2002 0001 0000 0000 0000 0070
2001 1002 3333 0001 0000 0000 0000 0001
@@ -18,14 +27,18 @@ ef00 1001 2002 0001 0000 0000 0000 0070
f427
0000 0344 0000 0004 f8f1 9d3c ddba 0e00
+#
+# ICMPV6
+# - Time exceeded
+#
[in,gif0] 6000 0000 0048 3a40
ef00 1001 0880 6cbf 0000 0000 0000 0001
ef00 1001 2002 0001 0000 0000 0000 0070
-0300 7ca9 0000 0000
+0300 7266 0000 0000
6000 0000 0018 1101
ef00 1001 2002 1001 0000 0000 0000 0070
2001 1002 3333 0001 0000 0000 0000 0001
-8083 829a
+8083 f8a3
0018
f427
0000 0344 0000 0004 f8f1 9d3c ddba 0e00
diff --git a/tests/ipf/input/n13_6 b/tests/ipf/input/n13_6
index c8a713d4f00..54b262dc8ea 100644
--- a/tests/ipf/input/n13_6
+++ b/tests/ipf/input/n13_6
@@ -1,4 +1,4 @@
-out6 on le0 192.168.1.1 150.1.1.1
-out6 on le0 192.168.1.1 150.1.1.2
-out6 on le0 192.168.1.2 150.1.1.2
-out6 on le0 192.168.1.3 150.1.1.1
+out6 on le0 192:168:1::1 150:1:1::1
+out6 on le0 192:168:1::1 150:1:1::2
+out6 on le0 192:168:1::2 150:1:1::2
+out6 on le0 192:168:1::3 150:1:1::1
diff --git a/tests/ipf/input/n14_6 b/tests/ipf/input/n14_6
index 95e954736c4..f5dd5d359f6 100644
--- a/tests/ipf/input/n14_6
+++ b/tests/ipf/input/n14_6
@@ -1,4 +1,4 @@
-in6 on gre0 tcp 10::2:2:5,2000 203.1.1.1,80
-in6 on gre0 tcp 10::2:2:6,2000 203.1.1.1,80
-in6 on gre0 tcp 10::2:2:7,2000 203.1.1.1,80
-in6 on gre0 tcp 10::2:2:5,2001 203.1.1.1,80
+in6 on gre0 tcp 10::2:2:5,2000 203:1:1::1,80
+in6 on gre0 tcp 10::2:2:6,2000 203:1:1::1,80
+in6 on gre0 tcp 10::2:2:7,2000 203:1:1::1,80
+in6 on gre0 tcp 10::2:2:5,2001 203:1:1::1,80
diff --git a/tests/ipf/input/n201 b/tests/ipf/input/n201
deleted file mode 100644
index 933c9a3d84f..00000000000
--- a/tests/ipf/input/n201
+++ /dev/null
@@ -1,24 +0,0 @@
-[out,bge0]
-4500 0040 7ee9 4000 4006 5879 c0a8 7103 c0a8 7101
-ffdd 0017 21dd ace0 0000 0000 b002 8000
-83f8 0000 0204 05b4 0103 0300 0402 0101
-0101 080a 0000 0000 0000 0000
-
-[in,bge0]
-4500 0054 0000 4000 ff04 10fa c0a8 a801 0101 0101
-4500 0040 7ee9 4000 4006 5879 c0a8 7101 c0a8 7103
-0017 ffdd ace0 21dd 21dd ace1 b012 8000 b529 0000
-0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000
-
-[out,bge0]
-4500 0040 7ee9 4000 4006 5879 c0a8 7103 c0a8 7101
-ffdd 0017 21dd ace0 0000 0000 b002 8000
-83f8 0000 0204 05b4 0103 0300 0402 0101
-0101 080a 0000 0000 0000 0000
-
-[in,bge0]
-4500 0038 0000 4000 ff01 73bd 0303 0303
-0101 0101 0304 f3bd 0000 0514
-4500 0054 0001 4000 ff04 10f9 0101 0101 c0a8 a801
-4500 0040 7ee9 4000
-
diff --git a/tests/ipf/input/n202 b/tests/ipf/input/n202
deleted file mode 100644
index 3faa6532258..00000000000
--- a/tests/ipf/input/n202
+++ /dev/null
@@ -1,7 +0,0 @@
-[in,bge0]
-4500 0054 0000 4000 ff04 10fa c0a8 a801 0101 0101
-4500 0040 7ee9 4000 4006 5879 c0a8 7101
-c0a8 7103 0017 ffdd 21dd ace0 0000 0000
-b012 8000 83e8 0000 0204 05b4 0103 0300
-0402 0101 0101 080a 0000 0000 0000 0000
-
diff --git a/tests/ipf/input/n8_6 b/tests/ipf/input/n8_6
index 0bc29d6ea8f..8039f78df63 100644
--- a/tests/ipf/input/n8_6
+++ b/tests/ipf/input/n8_6
@@ -2,31 +2,34 @@
# ICMP ECHO (ping) exchange
[out,icmp0]
6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004
-8000 77df 6220 0000 3f6f 6e80 000b
+8000 774d 6220 0000 3f6f 6e80 000b
0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
3637
+# ECHO reply
[in,icmp0]
6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0010 0010 0010 0000 0000 0000 0000 0001
-8100 76df 6220 0000 3f6f 6e80 000b
+8100 7624 6220 0000 3f6f 6e80 000b
0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
3637
+# ECHO request
[out,icmp0]
6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004
-8000 77de 6220 0001 3f6f 6e80 000b
+8000 774c 6220 0001 3f6f 6e80 000b
0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
3637
+# ECHO reply
[in,icmp0]
6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0010 0010 0010 0000 0000 0000 0000 0001
-8100 76de 6220 0001 3f6f 6e80 000b
+8100 7623 6220 0001 3f6f 6e80 000b
0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
diff --git a/tests/ipf/input/n9_6 b/tests/ipf/input/n9_6
index 738509669f2..42db09dd365 100644
--- a/tests/ipf/input/n9_6
+++ b/tests/ipf/input/n9_6
@@ -2,7 +2,7 @@
# ICMP ECHO (ping) exchange
[in,icmp0]
6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004
-8000 77df 6220 0000 3f6f 6e80 000b
+8000 774d 6220 0000 3f6f 6e80 000b
0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
@@ -10,7 +10,7 @@
[out,icmp0]
6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0002 0000 0000 0000 0000 0002 0002 0002
-8100 76df 6220 0000 3f6f 6e80 000b
+8100 762c 6220 0000 3f6f 6e80 000b
0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
@@ -18,7 +18,7 @@
[in,icmp0]
6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004
-8000 77de 6220 0001 3f6f 6e80 000b
+8000 774c 6220 0001 3f6f 6e80 000b
0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
@@ -26,7 +26,7 @@
[out,icmp0]
6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0002 0000 0000 0000 0000 0002 0002 0002
-8100 76de 6220 0001 3f6f 6e80 000b
+8100 762b 6220 0001 3f6f 6e80 000b
0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
diff --git a/tests/ipf/regress/i18 b/tests/ipf/regress/i18
index 9a91a2fa204..b55b11a01fe 100644
--- a/tests/ipf/regress/i18
+++ b/tests/ipf/regress/i18
@@ -1,3 +1,3 @@
pass in tos {80,0x80} all
-pass in tos {0x80,80} all
+pass out tos {0x80,80} all
block in ttl {0,1,2,3,4,5,6} all
diff --git a/tests/ipf/regress/ipv6.5 b/tests/ipf/regress/ipv6.5
index 497087bba04..d9ae23b2fbd 100644
--- a/tests/ipf/regress/ipv6.5
+++ b/tests/ipf/regress/ipv6.5
@@ -1,2 +1,2 @@
-pass out family inet6 all with v6hdrs routing
-block out family inet6 proto tcp all with v6hdrs routing
+pass out family inet6 all with v6hdr routing
+block out family inet6 proto tcp all with v6hdr routing
diff --git a/tests/ipf/regress/n13_6 b/tests/ipf/regress/n13_6
index 242da15f323..c1d1646d2dd 100644
--- a/tests/ipf/regress/n13_6
+++ b/tests/ipf/regress/n13_6
@@ -1 +1 @@
-map le0 192.168.0.0/32 -> range 203:0:1::1:23-203:0:1::3:45
+map le0 192:168:1::0/48 -> range 203:0:1::1:23-203:0:1::3:45
diff --git a/tests/ipf/regress/n201 b/tests/ipf/regress/n201
deleted file mode 100644
index d7ee0eb9927..00000000000
--- a/tests/ipf/regress/n201
+++ /dev/null
@@ -1 +0,0 @@
-encap out on bge0 proto tcp from any to any port = 23 -> src 1.1.1.1 dst 192.168.168.1;
diff --git a/tests/ipf/regress/n202 b/tests/ipf/regress/n202
deleted file mode 100644
index d7ee0eb9927..00000000000
--- a/tests/ipf/regress/n202
+++ /dev/null
@@ -1 +0,0 @@
-encap out on bge0 proto tcp from any to any port = 23 -> src 1.1.1.1 dst 192.168.168.1;