Module Name: src
Committed By: tls
Date: Sun Aug 10 06:57:10 UTC 2014
Modified Files:
src/tests/ipf [tls-earlyentropy]: t_filter_parse.sh t_nat_exec.sh
t_nat_parse.sh
src/tests/ipf/expected [tls-earlyentropy]: Makefile in2
src/tests/ipf/input [tls-earlyentropy]: Makefile
src/tests/ipf/regress [tls-earlyentropy]: Makefile
Added Files:
src/tests/ipf/expected [tls-earlyentropy]: in100_6 in101_6 in102_6
in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6
src/tests/ipf/regress [tls-earlyentropy]: in100_6 in101_6 in102_6 in1_6
in2_6 in3_6 in4_6 in5_6 in6_6 in8_6
Removed Files:
src/tests/ipf/input [tls-earlyentropy]: n17_6
src/tests/ipf/regress [tls-earlyentropy]: n17_6
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.6.1 src/tests/ipf/t_filter_parse.sh
cvs rdiff -u -r1.18 -r1.18.4.1 src/tests/ipf/t_nat_exec.sh
cvs rdiff -u -r1.6 -r1.6.8.1 src/tests/ipf/t_nat_parse.sh
cvs rdiff -u -r1.6 -r1.6.8.1 src/tests/ipf/expected/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/tests/ipf/expected/in100_6 \
src/tests/ipf/expected/in101_6 src/tests/ipf/expected/in102_6 \
src/tests/ipf/expected/in1_6 src/tests/ipf/expected/in3_6 \
src/tests/ipf/expected/in4_6 src/tests/ipf/expected/in5_6 \
src/tests/ipf/expected/in6_6 src/tests/ipf/expected/in8_6
cvs rdiff -u -r1.4 -r1.4.8.1 src/tests/ipf/expected/in2
cvs rdiff -u -r0 -r1.2.2.2 src/tests/ipf/expected/in2_6
cvs rdiff -u -r1.6 -r1.6.8.1 src/tests/ipf/input/Makefile
cvs rdiff -u -r1.3 -r0 src/tests/ipf/input/n17_6
cvs rdiff -u -r1.6 -r1.6.8.1 src/tests/ipf/regress/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/tests/ipf/regress/in100_6 \
src/tests/ipf/regress/in101_6 src/tests/ipf/regress/in102_6 \
src/tests/ipf/regress/in1_6 src/tests/ipf/regress/in2_6 \
src/tests/ipf/regress/in3_6 src/tests/ipf/regress/in4_6 \
src/tests/ipf/regress/in5_6 src/tests/ipf/regress/in6_6 \
src/tests/ipf/regress/in8_6
cvs rdiff -u -r1.3 -r0 src/tests/ipf/regress/n17_6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_filter_parse.sh
diff -u src/tests/ipf/t_filter_parse.sh:1.10 src/tests/ipf/t_filter_parse.sh:1.10.6.1
--- src/tests/ipf/t_filter_parse.sh:1.10 Sun Mar 17 03:00:05 2013
+++ src/tests/ipf/t_filter_parse.sh Sun Aug 10 06:57:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_filter_parse.sh,v 1.10 2013/03/17 03:00:05 jmmv Exp $
+# $NetBSD: t_filter_parse.sh,v 1.10.6.1 2014/08/10 06:57:10 tls Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -101,7 +101,7 @@ test_case i15 itest text ipf
test_case i16 itest text ipf
failing_test_case i17 itest "Known to be broken" text ipftest
test_case i18 itest text ipf
-test_case i19 itest_i19 "PR kern/47262 Proto-family missing from logs" text ipf
+test_case i19 itest_i19 text ipf
test_case i20 itest text ipf
test_case i21 itest text ipf
test_case i22 itest text ipf
Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.18 src/tests/ipf/t_nat_exec.sh:1.18.4.1
--- src/tests/ipf/t_nat_exec.sh:1.18 Thu May 16 07:43:02 2013
+++ src/tests/ipf/t_nat_exec.sh Sun Aug 10 06:57:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.18 2013/05/16 07:43:02 martin Exp $
+# $NetBSD: t_nat_exec.sh,v 1.18.4.1 2014/08/10 06:57:10 tls Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -67,8 +67,8 @@ test_case n4 nattest text text
test_case n5 nattest text text
test_case n6 nattest text text
test_case n7 nattest text text
-failing_test_case_be n8 nattest "See PR kern/47665" hex hex -T update_ipid=0
-failing_test_case_be n9 nattest "See PR kern/47665" hex hex -T update_ipid=0
+test_case n8 nattest hex hex -T update_ipid=0
+test_case n9 nattest hex hex -T update_ipid=0
test_case n10 nattest hex hex -T update_ipid=0
test_case n11 nattest text text
failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v
@@ -97,7 +97,6 @@ failing_test_case_be n9_6 nattest "See P
test_case n11_6 nattest text text -6
test_case n12_6 nattest hex hex -6
test_case n15_6 nattest text text -6
-failing_test_case n17_6 nattest "Test golden output file missing" hex hex -6
atf_init_test_cases()
{
@@ -138,6 +137,4 @@ atf_init_test_cases()
atf_add_test_case n11_6
atf_add_test_case n12_6
atf_add_test_case n15_6
- atf_add_test_case n17_6
-
}
Index: src/tests/ipf/t_nat_parse.sh
diff -u src/tests/ipf/t_nat_parse.sh:1.6 src/tests/ipf/t_nat_parse.sh:1.6.8.1
--- src/tests/ipf/t_nat_parse.sh:1.6 Sun Jul 8 00:48:29 2012
+++ src/tests/ipf/t_nat_parse.sh Sun Aug 10 06:57:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_parse.sh,v 1.6 2012/07/08 00:48:29 pgoyette Exp $
+# $NetBSD: t_nat_parse.sh,v 1.6.8.1 2014/08/10 06:57:10 tls Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,7 +38,7 @@ intest()
}
test_case in1 intest text text
-broken_test_case in2 intest text text
+test_case in2 intest text text
test_case in3 intest text text
test_case in4 intest text text
test_case in5 intest text text
@@ -47,6 +47,16 @@ test_case in7 intest text text
test_case in100 intest text text
test_case in101 intest text text
test_case in102 intest text text
+test_case in1_6 intest text text
+test_case in2_6 intest text text
+test_case in3_6 intest text text
+test_case in4_6 intest text text
+test_case in5_6 intest text text
+test_case in6_6 intest text text
+test_case in8_6 intest text text
+test_case in100_6 intest text text
+test_case in101_6 intest text text
+test_case in102_6 intest text text
atf_init_test_cases()
{
@@ -60,4 +70,14 @@ atf_init_test_cases()
atf_add_test_case in100
atf_add_test_case in101
atf_add_test_case in102
+ atf_add_test_case in1_6
+ atf_add_test_case in2_6
+ atf_add_test_case in3_6
+ atf_add_test_case in4_6
+ atf_add_test_case in5_6
+ atf_add_test_case in6_6
+ atf_add_test_case in8_6
+ atf_add_test_case in100_6
+ atf_add_test_case in101_6
+ atf_add_test_case in102_6
}
Index: src/tests/ipf/expected/Makefile
diff -u src/tests/ipf/expected/Makefile:1.6 src/tests/ipf/expected/Makefile:1.6.8.1
--- src/tests/ipf/expected/Makefile:1.6 Sun Jul 22 16:22:41 2012
+++ src/tests/ipf/expected/Makefile Sun Aug 10 06:57:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/07/22 16:22:41 darrenr Exp $
+# $NetBSD: Makefile,v 1.6.8.1 2014/08/10 06:57:10 tls Exp $
TESTSDIR= ${TESTSBASE}/ipf
ATFFILE= no
@@ -60,15 +60,25 @@ i7 \
i8 \
i9 \
in1 \
+in1_6 \
in100 \
+in100_6 \
in101 \
+in101_6 \
in102 \
+in102_6 \
in2 \
+in2_6 \
in3 \
+in3_6 \
in4 \
+in4_6 \
in5 \
+in5_6 \
in6 \
+in6_6 \
in7 \
+in8_6 \
ip1 \
ip2 \
ip3 \
Index: src/tests/ipf/expected/in2
diff -u src/tests/ipf/expected/in2:1.4 src/tests/ipf/expected/in2:1.4.8.1
--- src/tests/ipf/expected/in2:1.4 Fri Mar 23 23:08:00 2012
+++ src/tests/ipf/expected/in2 Sun Aug 10 06:57:10 2014
@@ -1,5 +1,5 @@
rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1/32 port 0 tcp
-rdr le0 9.8.7.6/32 -> 1.1.1.1/32 255
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 reserved
rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp
rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip
rdr le0 9.0.0.0/8 -> 1.1.1.1/32 ip
Index: src/tests/ipf/input/Makefile
diff -u src/tests/ipf/input/Makefile:1.6 src/tests/ipf/input/Makefile:1.6.8.1
--- src/tests/ipf/input/Makefile:1.6 Sun Jul 22 16:22:41 2012
+++ src/tests/ipf/input/Makefile Sun Aug 10 06:57:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/07/22 16:22:41 darrenr Exp $
+# $NetBSD: Makefile,v 1.6.8.1 2014/08/10 06:57:10 tls Exp $
TESTSDIR= ${TESTSBASE}/ipf
ATFFILE= no
@@ -64,7 +64,6 @@ n15 \
n15_6 \
n16 \
n17 \
-n17_6 \
n18 \
n1_6 \
n2 \
Index: src/tests/ipf/regress/Makefile
diff -u src/tests/ipf/regress/Makefile:1.6 src/tests/ipf/regress/Makefile:1.6.8.1
--- src/tests/ipf/regress/Makefile:1.6 Sun Jul 22 16:22:41 2012
+++ src/tests/ipf/regress/Makefile Sun Aug 10 06:57:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/07/22 16:22:41 darrenr Exp $
+# $NetBSD: Makefile,v 1.6.8.1 2014/08/10 06:57:10 tls Exp $
TESTSDIR= ${TESTSBASE}/ipf
ATFFILE= no
@@ -62,15 +62,25 @@ i7 \
i8 \
i9 \
in1 \
+in1_6 \
in100 \
+in100_6 \
in101 \
+in101_6 \
in102 \
+in102_6 \
in2 \
+in2_6 \
in3 \
+in3_6 \
in4 \
+in4_6 \
in5 \
+in5_6 \
in6 \
+in6_6 \
in7 \
+in8_6 \
ip1 \
ip2 \
ip3 \
@@ -104,7 +114,6 @@ n15_6 \
n16 \
n16_6 \
n17 \
-n17_6 \
n18 \
n1_6 \
n2 \
Added files:
Index: src/tests/ipf/expected/in100_6
diff -u /dev/null src/tests/ipf/expected/in100_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/expected/in100_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,3 @@
+rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128;
+rewrite out on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::/96 dst 4::4:4:4/128;
+rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::/96 dst 4::4:0:0/96;
Index: src/tests/ipf/expected/in101_6
diff -u /dev/null src/tests/ipf/expected/in101_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/expected/in101_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,4 @@
+rewrite in on bge0 inet6 proto icmp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128;
+rewrite in on bge0 inet6 proto udp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128;
+rewrite out on bge0 inet6 proto tcp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3::/24 dst 4::4:4:4/128;
+rewrite in on bge0 inet6 proto tcp/udp from 1:1:1::1/128 to 2:2::/32 -> src 3::/24,20202 dst 4::/24,10101;
Index: src/tests/ipf/expected/in102_6
diff -u /dev/null src/tests/ipf/expected/in102_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/expected/in102_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,5 @@
+rewrite in on bge0 inet6 proto tcp from any to any -> src any dst dstlist/a;
+rewrite in on bge0 inet6 proto tcp from 1:1:1::1/128 to any -> src any dst dstlist/bee;
+rewrite in on bge0 inet6 proto tcp from 1:1:1::1/128 to 2:2::2:2/128 -> src any dst dstlist/cat;
+rewrite in on bge0 inet6 proto tcp from pool/a to 2:2::2:2/128 -> src any dst dstlist/bat;
+rewrite in on bge0 inet6 proto tcp from pool/a to pool/1 -> src any dst dstlist/ant;
Index: src/tests/ipf/expected/in1_6
diff -u /dev/null src/tests/ipf/expected/in1_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/expected/in1_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,29 @@
+map le0 inet6 any -> ::/128
+map le0 inet6 any -> any
+map le0 inet6 ::/1 -> any
+map le0 inet6 10::/16 -> 1:2:3::/96
+map le0 inet6 10::/16 -> 1:2:3::/96
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999
+map ppp0 inet6 192:168::/32 -> ::/128 portmap udp 20000:29999
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp/udp 30000:39999
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp auto
+map ppp0 inet6 192:168::/32 -> ::/128 portmap udp auto
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp/udp auto
+map ppp0 inet6 192:168::/32 -> ::/128 proxy port 21 ftp/tcp
+map ppp0 inet6 192:168::/32 -> ::/128 proxy port 1010 ftp/tcp
+map le0 inet6 any -> ::/128 frag
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999 frag
+map ppp0 inet6 192:168::/32 -> ::/128 proxy port 21 ftp/tcp frag
+map le0 inet6 any -> ::/128 age 10/10
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 age 10/20
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999 age 30/30
+map le0 inet6 any -> ::/128 frag age 10/10
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag age 10/20
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999 frag age 30/30
+map fxp0 inet6 from 192::/18 to any port = 21 -> 1:2:3::4/128 proxy port 21 ftp/tcp
+map thisisalonginte inet6 any -> ::/128 mssclamp 1452 tag freddyliveshere
+map bar0 inet6 any -> ::/128 icmpidmap icmp 1000:2000
+map ppp0,adsl0 inet6 any -> ::/128
+map ppp0 inet6 from 192:168::/32 to any port = 123 -> ::/128 age 30/1 udp
Index: src/tests/ipf/expected/in3_6
diff -u /dev/null src/tests/ipf/expected/in3_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/expected/in3_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,5 @@
+bimap le0 inet6 any -> ::/128
+bimap le0 inet6 any -> any
+bimap le0 inet6 ::/1 -> any
+bimap le0 inet6 10::/16 -> 1:2:3::/96
+bimap le0 inet6 10:0:5::/96 -> 1:2:3::/96
Index: src/tests/ipf/expected/in4_6
diff -u /dev/null src/tests/ipf/expected/in4_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/expected/in4_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,5 @@
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 0
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 0
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 256
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports auto
+map-block le0 inet6 10::/16 -> 203:1:1::/96 ports auto
Index: src/tests/ipf/expected/in5_6
diff -u /dev/null src/tests/ipf/expected/in5_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/expected/in5_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,24 @@
+map le0 inet6 from 9:8:7::6/128 port > 1024 to any -> 1:1:1::1/128 portmap tcp 10000:20000
+map le0 inet6 from 9:8:7::6/128 port > 1024 ! to 1:2:3::4/128 -> 1:1:1::1/128 portmap tcp 10000:20000
+rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1:1:1::1/128 port 0 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 ip
+rdr le0 inet6 ! from 1:2:3::4/128 to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 ip
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 udp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp/udp
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 icmp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp round-robin
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 ip frag
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 icmp frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp round-robin frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin frag
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp frag age 20/20
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp round-robin frag age 30/30
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin frag age 40/40
Index: src/tests/ipf/expected/in6_6
diff -u /dev/null src/tests/ipf/expected/in6_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/expected/in6_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,8 @@
+map foo0 inet6 from any port = 1 to any port != 0 -> ::/32 udp
+map foo0 inet6 from any port = 1 to any port != 0 -> ::/32 udp
+map foo0 inet6 from any port < 1 to any port > 0 -> ::/32 tcp
+map foo0 inet6 from any port < 1 to any port > 0 -> ::/32 tcp
+map foo0 inet6 from any port <= 1 to any port >= 0 -> ::/32 tcp/udp
+map foo0 inet6 from any port <= 1 to any port >= 0 -> ::/32 tcp/udp
+map foo0 inet6 from any port 1 >< 20 to any port 20 <> 40 -> ::/32 tcp/udp
+map foo0 inet6 from any port 10:20 to any port 30:40 -> ::/32 tcp/udp
Index: src/tests/ipf/expected/in8_6
diff -u /dev/null src/tests/ipf/expected/in8_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/expected/in8_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,6 @@
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 tcp purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 mssclamp 1000 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge
Index: src/tests/ipf/expected/in2_6
diff -u /dev/null src/tests/ipf/expected/in2_6:1.2.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/expected/in2_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,71 @@
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1/128 port 0 tcp
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 reserved
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip
+rdr le0 inet6 9:8::/32 -> 1:1:1::1/128 ip
+rdr le0 inet6 9:8:7::/64 -> 1:1:1::1/128 ip
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> any port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 udp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp/udp
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp/udp frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40 sticky
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10 mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20 mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10 mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10 mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20 mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10 mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000 tag nattagcacheline
+rdr ge0 inet6 9:8:7::6/128 port 21 -> 1:1:1::1/128 port 21 tcp proxy ftp
+rdr ge0 inet6 9:8:7::6/128 port 21 -> 1:1:1::1/128 port 21 tcp proxy ftp
+rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port 5555 tcp
+rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port = 5555 tcp
+rdr le0 inet6 any -> fe80:aa55:1234:5678:5a5a:a5a5:fedc:ba98/128 ip
+rdr le0 inet6 any -> fe80:aa55:1234:5678:5a5a:a5a5:fedc:ba98,fe80:aa55:1234:5678:5a5a:a5a5:fedc:ba98 ip
+rdr adsl0,ppp0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port 5555-7777 tcp
Index: src/tests/ipf/regress/in100_6
diff -u /dev/null src/tests/ipf/regress/in100_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/regress/in100_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,3 @@
+rewrite in on bge0 inet6 from 1:1:1::1 to 2:2::2:2 -> src 3:3:3::3 dst 4::4:4:4;
+rewrite out on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2 -> src 3:3:3::0/96 dst 4::4:4:4;
+rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::0/96 dst 4::4:4:4/96;
Index: src/tests/ipf/regress/in101_6
diff -u /dev/null src/tests/ipf/regress/in101_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/regress/in101_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,4 @@
+rewrite in on bge0 proto icmp from 1:1:1::1 to 2:2::2:2 -> src 3:3:3::3 dst 4::4:4:4;
+rewrite in on bge0 proto udp from 1:1:1::1 to 2:2::2:2 -> src 3:3:3::3 dst 4::4:4:4;
+rewrite out on bge0 proto tcp from 1:1:1::1/128 to 2:2::2:2 -> src 3:3:3::0/24 dst 4::4:4:4;
+rewrite in on bge0 proto tcp/udp from 1:1:1::1/128 to 2:2::2:2/32 -> src 3:3:3::0/24,20202 dst 4::4:4:4/24,10101;
Index: src/tests/ipf/regress/in102_6
diff -u /dev/null src/tests/ipf/regress/in102_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/regress/in102_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,5 @@
+rewrite in on bge0 inet6 proto tcp from any to any -> src 0/0 dst dstlist/a;
+rewrite in on bge0 inet6 proto tcp from 1:1:1::1 to any -> src 0/0 dst dstlist/bee;
+rewrite in on bge0 inet6 proto tcp from 1:1:1::1 to 2:2::2:2 -> src 0/0 dst dstlist/cat;
+rewrite in on bge0 inet6 proto tcp from pool/a to 2:2::2:2 -> src 0/0 dst dstlist/bat;
+rewrite in on bge0 inet6 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant;
Index: src/tests/ipf/regress/in1_6
diff -u /dev/null src/tests/ipf/regress/in1_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/regress/in1_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,29 @@
+map le0 inet6 0/0 -> 0/128
+map le0 inet6 1/128 -> 1/128
+map le0 inet6 128::/1 -> 0/0
+map le0 inet6 10::0/16 -> 1:2:3::0/96
+map le0 inet6 10::5/16 -> 1:2:3::4/96
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999
+map ppp0 inet6 192:168::/32 -> 0/128 portmap udp 20000:29999
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp/udp 30000:39999
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp auto
+map ppp0 inet6 192:168::/32 -> 0/128 portmap udp auto
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcpudp auto
+map ppp0 inet6 192:168::/32 -> 0/128 proxy port ftp ftp/6
+map ppp0 inet6 192:168::/32 -> 0/128 proxy port 1010 ftp/tcp
+map le0 inet6 0/0 -> 0/128 frag
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999 frag
+map ppp0 inet6 192:168::/32 -> 0/128 proxy port ftp ftp/tcp frag
+map le0 inet6 0/0 -> 0/128 age 10
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 age 10/20
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999 age 30
+map le0 inet6 0/0 -> 0/128 frag age 10
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag age 10/20
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999 frag age 30
+map fxp0 inet6 from 192:168::/18 to 0/0 port = 21 -> 1:2:3::4/128 proxy port 21 ftp/tcp
+map thisisalonginte inet6 0/0 -> 0/128 mssclamp 1452 tag freddyliveshere
+map bar0 inet6 0/0 -> 0/128 icmpidmap ipv6-icmp 1000:2000
+map ppp0,adsl0 inet6 0/0 -> 0/128
+map ppp0 inet6 from 192:168::/32 to any port = 123 -> 0/128 age 30/1 udp
Index: src/tests/ipf/regress/in2_6
diff -u /dev/null src/tests/ipf/regress/in2_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/regress/in2_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,71 @@
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 tcp
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 255
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1 ip
+rdr le0 inet6 9:8:7::6/32 -> 1:1:1::1 ip
+rdr le0 inet6 9:8:7::6/64 -> 1:1:1::1 ip
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 0/0 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 udp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp/udp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcpudp frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1 ip frag age 10
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip sticky
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10 sticky
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40 sticky
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000 tag nattagcacheline
+rdr ge0 9:8:7::6/128 -> 1:1:1::1 proxy port 21 ftp/tcp
+rdr ge0 9:8:7::6/128 port 21 -> 1:1:1::1 port 21 tcp proxy ftp
+rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1 port 5555 tcp
+rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1 port = 5555 tcp
+rdr le0 inet6 0/0 -> test.host.dots
+rdr le0 inet6 any -> test.host.dots,test.host.dots
+rdr adsl0,ppp0 9:8:7::6/128 port 1000-2000 -> 1:1:1::1 port 5555-7777 tcp
Index: src/tests/ipf/regress/in3_6
diff -u /dev/null src/tests/ipf/regress/in3_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/regress/in3_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,5 @@
+bimap le0 inet6 0/0 -> 0/128
+bimap le0 inet6 1/128 -> 1/128
+bimap le0 inet6 128::/1 -> 0/0
+bimap le0 inet6 10::/16 -> 1:2:3::0/96
+bimap le0 inet6 10:0:5::6/96 -> 1:2:3::4/96
Index: src/tests/ipf/regress/in4_6
diff -u /dev/null src/tests/ipf/regress/in4_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/regress/in4_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,5 @@
+map-block le0 inet6 10::/96 -> 203:1:1::/96
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 0
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 256
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports auto
+map-block le0 inet6 10::/16 -> 203:1:1::/96 ports auto
Index: src/tests/ipf/regress/in5_6
diff -u /dev/null src/tests/ipf/regress/in5_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/regress/in5_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,24 @@
+map le0 inet6 from 9:8:7::6/128 port > 1024 to any -> 1:1:1::1 portmap 10000:20000 tcp
+map le0 inet6 from 9:8:7::6/128 port > 1024 to ! 1:2:3::4 -> 1:1:1::1 portmap 10000:20000 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1:1:1::1 port 0 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1:1:1::1 port 0 ip
+rdr le0 inet6 ! from 1:2:3::4 to 9:8:7::6 port = 8888 -> 1:1:1::1 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 ip
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 udp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 tcp/udp
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1 port 888 icmp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 tcp round-robin
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1 port 0 ip frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 icmp frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 tcp round-robin frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin frag
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1 port 0 ip frag age 10
+rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1:1:1::1 port 0 ip frag age 10/20
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 icmp frag age 10
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp frag age 20
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 tcp round-robin frag age 30
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin frag age 40
Index: src/tests/ipf/regress/in6_6
diff -u /dev/null src/tests/ipf/regress/in6_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/regress/in6_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,8 @@
+map foo0 inet6 from any port = 1 to any port != 0 -> 0/32 udp
+map foo0 inet6 from any port eq 1 to any port ne 0 -> 0/32 udp
+map foo0 inet6 from any port < 1 to any port > 0 -> 0/32 tcp
+map foo0 inet6 from any port lt 1 to any port gt 0 -> 0/32 tcp
+map foo0 inet6 from any port <= 1 to any port >= 0 -> 0/32 tcp/udp
+map foo0 inet6 from any port le 1 to any port ge 0 -> 0/32 tcp/udp
+map foo0 inet6 from any port 1 >< 20 to any port 20 <> 40 -> 0/32 tcp/udp
+map foo0 inet6 from any port 10:20 to any port 30:40 -> 0/32 tcp/udp
Index: src/tests/ipf/regress/in8_6
diff -u /dev/null src/tests/ipf/regress/in8_6:1.1.2.2
--- /dev/null Sun Aug 10 06:57:10 2014
+++ src/tests/ipf/regress/in8_6 Sun Aug 10 06:57:10 2014
@@ -0,0 +1,6 @@
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 tcp purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 mssclamp 1000 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge
