diff options
98 files changed, 383 insertions, 368 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile index f424643e84b..dabe7cca87c 100644 --- a/regress/sbin/pfctl/Makefile +++ b/regress/sbin/pfctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.164 2003/11/06 15:22:16 henning Exp $ +# $OpenBSD: Makefile,v 1.165 2003/12/05 16:55:40 henning Exp $ # TARGETS # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok @@ -29,6 +29,17 @@ PFALTQ=1 2 3 4 5 6 7 8 9 10 11 12 13 14 PFTABLE=1 2 3 4 5 6 7 8 9 10 11 12 13 PFOPT=1 2 3 4 5 +.BEGIN: + -${SUDO} ifconfig lo1000000 create + -${SUDO} ifconfig tun1000000 create + -${SUDO} ifconfig tun1000001 create + +.END: + ${SUDO} ifconfig lo1000000 destroy +# destroy on tun does not work yet +# ${SUDO} ifconfig tun1000000 destroy +# ${SUDO} ifconfig tun1000001 destroy + .for n in ${PFFAIL} PFAIL_TARGETS+=pfail${n} PFAIL_UPDATES+=pfail${n}-update diff --git a/regress/sbin/pfctl/pf13.in b/regress/sbin/pfctl/pf13.in index 3ec22f59cc1..4b7fd5c6bdd 100644 --- a/regress/sbin/pfctl/pf13.in +++ b/regress/sbin/pfctl/pf13.in @@ -2,21 +2,21 @@ pass in quick on enc0 fastroute all pass in quick on enc0 fastroute inet all pass in quick on enc0 fastroute inet6 all -pass out quick on tun0 route-to tun1 inet all -pass out quick on tun0 route-to tun1 from any to 192.168.1.1 -pass out quick on tun0 route-to tun1 from any to fec0::1 +pass out quick on tun1000000 route-to tun1000001 inet all +pass out quick on tun1000000 route-to tun1000001 from any to 192.168.1.1 +pass out quick on tun1000000 route-to tun1000001 from any to fec0::1 -block in on tun0 dup-to (tun1 192.168.1.1) proto tcp from any to any port = 21 -block in on tun0 dup-to (tun1 fec0::1) proto tcp from any to any port = 21 +block in on tun1000000 dup-to (tun1000001 192.168.1.1) proto tcp from any to any port = 21 +block in on tun1000000 dup-to (tun1000001 fec0::1) proto tcp from any to any port = 21 -pass in quick on tun0 route-to tun1 from 192.168.1.1/32 to 10.1.1.1/32 -pass in quick on tun0 route-to tun1 from fec0::1/64 to fec1::2/128 +pass in quick on tun1000000 route-to tun1000001 from 192.168.1.1/32 to 10.1.1.1/32 +pass in quick on tun1000000 route-to tun1000001 from fec0::1/64 to fec1::2/128 -block in on tun0 reply-to (tun1 192.168.1.1) proto tcp from any to any port = 21 -block in on tun0 reply-to (tun1 fec0::1) proto tcp from any to any port = 21 +block in on tun1000000 reply-to (tun1000001 192.168.1.1) proto tcp from any to any port = 21 +block in on tun1000000 reply-to (tun1000001 fec0::1) proto tcp from any to any port = 21 -pass in quick on tun0 reply-to tun1 from 192.168.1.1/32 to 10.1.1.1/32 -pass in quick on tun0 reply-to tun1 from fec0::1/64 to fec1::2/128 +pass in quick on tun1000000 reply-to tun1000001 from 192.168.1.1/32 to 10.1.1.1/32 +pass in quick on tun1000000 reply-to tun1000001 from fec0::1/64 to fec1::2/128 -pass in quick on tun0 dup-to (tun1 192.168.1.100) from 192.168.1.1/32 to 10.1.1.1/32 -pass in quick on tun0 dup-to (tun1 fec1::2) from fec0::1/64 to fec1::2/128 +pass in quick on tun1000000 dup-to (tun1000001 192.168.1.100) from 192.168.1.1/32 to 10.1.1.1/32 +pass in quick on tun1000000 dup-to (tun1000001 fec1::2) from fec0::1/64 to fec1::2/128 diff --git a/regress/sbin/pfctl/pf13.loaded b/regress/sbin/pfctl/pf13.loaded index 3dcbb66dbba..4dc8cd3259a 100644 --- a/regress/sbin/pfctl/pf13.loaded +++ b/regress/sbin/pfctl/pf13.loaded @@ -10,55 +10,55 @@ [ Skip steps: p=6 sa=8 sp=end da=4 dp=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass out quick on tun0 route-to tun1 inet all +@3 pass out quick on tun1000000 route-to tun1000001 inet all [ Skip steps: i=end d=6 f=5 p=6 sa=8 sp=end dp=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out quick on tun0 route-to tun1 inet from any to 192.168.1.1 +@4 pass out quick on tun1000000 route-to tun1000001 inet from any to 192.168.1.1 [ Skip steps: i=end d=6 p=6 sa=8 sp=end dp=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass out quick on tun0 route-to tun1 inet6 from any to fec0::1 +@5 pass out quick on tun1000000 route-to tun1000001 inet6 from any to fec0::1 [ Skip steps: i=end sa=8 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 block drop in on tun0 dup-to (tun1 192.168.1.1) inet proto tcp from any to any port = ftp +@6 block drop in on tun1000000 dup-to (tun1000001 192.168.1.1) inet proto tcp from any to any port = ftp [ Skip steps: i=end d=end p=8 sa=8 sp=end da=8 dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 block drop in on tun0 dup-to (tun1 fec0::1) inet6 proto tcp from any to any port = ftp +@7 block drop in on tun1000000 dup-to (tun1000001 fec0::1) inet6 proto tcp from any to any port = ftp [ Skip steps: i=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in quick on tun0 route-to tun1 inet from 192.168.1.1 to 10.1.1.1 +@8 pass in quick on tun1000000 route-to tun1000001 inet from 192.168.1.1 to 10.1.1.1 [ Skip steps: i=end d=end p=10 sp=end dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in quick on tun0 route-to tun1 inet6 from fec0::/64 to fec1::2 +@9 pass in quick on tun1000000 route-to tun1000001 inet6 from fec0::/64 to fec1::2 [ Skip steps: i=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 block drop in on tun0 reply-to (tun1 192.168.1.1) inet proto tcp from any to any port = ftp +@10 block drop in on tun1000000 reply-to (tun1000001 192.168.1.1) inet proto tcp from any to any port = ftp [ Skip steps: i=end d=end p=12 sa=12 sp=end da=12 dp=12 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 block drop in on tun0 reply-to (tun1 fec0::1) inet6 proto tcp from any to any port = ftp +@11 block drop in on tun1000000 reply-to (tun1000001 fec0::1) inet6 proto tcp from any to any port = ftp [ Skip steps: i=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass in quick on tun0 reply-to tun1 inet from 192.168.1.1 to 10.1.1.1 +@12 pass in quick on tun1000000 reply-to tun1000001 inet from 192.168.1.1 to 10.1.1.1 [ Skip steps: i=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass in quick on tun0 reply-to tun1 inet6 from fec0::/64 to fec1::2 +@13 pass in quick on tun1000000 reply-to tun1000001 inet6 from fec0::/64 to fec1::2 [ Skip steps: i=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass in quick on tun0 dup-to (tun1 192.168.1.100) inet from 192.168.1.1 to 10.1.1.1 +@14 pass in quick on tun1000000 dup-to (tun1000001 192.168.1.100) inet from 192.168.1.1 to 10.1.1.1 [ Skip steps: i=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in quick on tun0 dup-to (tun1 fec1::2) inet6 from fec0::/64 to fec1::2 +@15 pass in quick on tun1000000 dup-to (tun1000001 fec1::2) inet6 from fec0::/64 to fec1::2 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf13.ok b/regress/sbin/pfctl/pf13.ok index f8b4cec594e..63ff2e1204c 100644 --- a/regress/sbin/pfctl/pf13.ok +++ b/regress/sbin/pfctl/pf13.ok @@ -1,16 +1,16 @@ pass in quick on enc0 fastroute all pass in quick on enc0 fastroute inet all pass in quick on enc0 fastroute inet6 all -pass out quick on tun0 route-to tun1 inet all -pass out quick on tun0 route-to tun1 inet from any to 192.168.1.1 -pass out quick on tun0 route-to tun1 inet6 from any to fec0::1 -block drop in on tun0 dup-to (tun1 192.168.1.1) inet proto tcp from any to any port = ftp -block drop in on tun0 dup-to (tun1 fec0::1) inet6 proto tcp from any to any port = ftp -pass in quick on tun0 route-to tun1 inet from 192.168.1.1 to 10.1.1.1 -pass in quick on tun0 route-to tun1 inet6 from fec0::/64 to fec1::2 -block drop in on tun0 reply-to (tun1 192.168.1.1) inet proto tcp from any to any port = ftp -block drop in on tun0 reply-to (tun1 fec0::1) inet6 proto tcp from any to any port = ftp -pass in quick on tun0 reply-to tun1 inet from 192.168.1.1 to 10.1.1.1 -pass in quick on tun0 reply-to tun1 inet6 from fec0::/64 to fec1::2 -pass in quick on tun0 dup-to (tun1 192.168.1.100) inet from 192.168.1.1 to 10.1.1.1 -pass in quick on tun0 dup-to (tun1 fec1::2) inet6 from fec0::/64 to fec1::2 +pass out quick on tun1000000 route-to tun1000001 inet all +pass out quick on tun1000000 route-to tun1000001 inet from any to 192.168.1.1 +pass out quick on tun1000000 route-to tun1000001 inet6 from any to fec0::1 +block drop in on tun1000000 dup-to (tun1000001 192.168.1.1) inet proto tcp from any to any port = ftp +block drop in on tun1000000 dup-to (tun1000001 fec0::1) inet6 proto tcp from any to any port = ftp +pass in quick on tun1000000 route-to tun1000001 inet from 192.168.1.1 to 10.1.1.1 +pass in quick on tun1000000 route-to tun1000001 inet6 from fec0::/64 to fec1::2 +block drop in on tun1000000 reply-to (tun1000001 192.168.1.1) inet proto tcp from any to any port = ftp +block drop in on tun1000000 reply-to (tun1000001 fec0::1) inet6 proto tcp from any to any port = ftp +pass in quick on tun1000000 reply-to tun1000001 inet from 192.168.1.1 to 10.1.1.1 +pass in quick on tun1000000 reply-to tun1000001 inet6 from fec0::/64 to fec1::2 +pass in quick on tun1000000 dup-to (tun1000001 192.168.1.100) inet from 192.168.1.1 to 10.1.1.1 +pass in quick on tun1000000 dup-to (tun1000001 fec1::2) inet6 from fec0::/64 to fec1::2 diff --git a/regress/sbin/pfctl/pf15.in b/regress/sbin/pfctl/pf15.in index 8f8b7dbe5d3..b9f987fd90d 100644 --- a/regress/sbin/pfctl/pf15.in +++ b/regress/sbin/pfctl/pf15.in @@ -1,11 +1,11 @@ scrub in on lo0 from any to any no-df scrub in log on lo0 from any to any min-ttl 25 scrub on lo0 from any to any max-mss 224 -scrub out log on lo1 from any to 10.0.0.1 no-df max-mss 224 +scrub out log on lo1000000 from any to 10.0.0.1 no-df max-mss 224 scrub in on lo0 from any to any max-mss 224 -scrub in log on {lo0 lo1} from any to any +scrub in log on {lo0 lo1000000} from any to any scrub in on lo0 inet from (lo0) to any -scrub in log on lo0 inet6 from { (lo1), (lo0) } to 2000::1 +scrub in log on lo0 inet6 from { (lo1000000), (lo0) } to 2000::1 scrub in inet from { 10.0.0.1, 10.0.0.2 } to { 10.0.0.3, 10.0.0.4 } scrub in from { lo0 10.1.1.1 } to any scrub in from { 10.0.0.1 lo0 } to any diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded index cb23a2d891c..9a9ac8e95ed 100644 --- a/regress/sbin/pfctl/pf15.loaded +++ b/regress/sbin/pfctl/pf15.loaded @@ -10,7 +10,7 @@ [ Skip steps: p=end sa=7 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 scrub out log on lo1 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble +@3 scrub out log on lo1000000 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble [ Skip steps: p=end sa=7 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -22,7 +22,7 @@ [ Skip steps: d=end f=7 p=end sa=7 sp=end da=8 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 scrub in log on lo1 all fragment reassemble +@6 scrub in log on lo1000000 all fragment reassemble [ Skip steps: d=end p=end sp=end da=8 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -30,7 +30,7 @@ [ Skip steps: i=10 d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 scrub in log on lo0 inet6 from (lo1) to 2000::1 fragment reassemble +@8 scrub in log on lo0 inet6 from (lo1000000) to 2000::1 fragment reassemble [ Skip steps: i=10 d=end f=10 p=end sp=end da=10 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf15.ok b/regress/sbin/pfctl/pf15.ok index 06ea402abd3..77112864b73 100644 --- a/regress/sbin/pfctl/pf15.ok +++ b/regress/sbin/pfctl/pf15.ok @@ -1,12 +1,12 @@ scrub in on lo0 all no-df fragment reassemble scrub in log on lo0 all min-ttl 25 fragment reassemble scrub on lo0 all max-mss 224 fragment reassemble -scrub out log on lo1 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble +scrub out log on lo1000000 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble scrub in on lo0 all max-mss 224 fragment reassemble scrub in log on lo0 all fragment reassemble -scrub in log on lo1 all fragment reassemble +scrub in log on lo1000000 all fragment reassemble scrub in on lo0 inet from (lo0) to any fragment reassemble -scrub in log on lo0 inet6 from (lo1) to 2000::1 fragment reassemble +scrub in log on lo0 inet6 from (lo1000000) to 2000::1 fragment reassemble scrub in log on lo0 inet6 from (lo0) to 2000::1 fragment reassemble scrub in inet from 10.0.0.1 to 10.0.0.3 fragment reassemble scrub in inet from 10.0.0.1 to 10.0.0.4 fragment reassemble diff --git a/regress/sbin/pfctl/pf16.in b/regress/sbin/pfctl/pf16.in index b9767d66f39..1879d01427d 100644 --- a/regress/sbin/pfctl/pf16.in +++ b/regress/sbin/pfctl/pf16.in @@ -3,5 +3,5 @@ scrub in on lo0 all nat on lo0 from 192.168.1.1 to any -> 10.0.0.1 rdr on lo0 proto tcp from any to 1.2.3.4/32 port 2222 -> 10.0.0.10 port 22 binat on lo0 from 192.168.1.1 to any -> 10.0.0.1 -pass in on lo1 all +pass in on lo1000000 all diff --git a/regress/sbin/pfctl/pf16.loaded b/regress/sbin/pfctl/pf16.loaded index 1ced4f27f20..7cf47b89dd6 100644 --- a/regress/sbin/pfctl/pf16.loaded +++ b/regress/sbin/pfctl/pf16.loaded @@ -14,7 +14,7 @@ [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 pass in on lo1 all +@0 pass in on lo1000000 all [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf16.ok b/regress/sbin/pfctl/pf16.ok index 975777095b6..0e81b947e60 100644 --- a/regress/sbin/pfctl/pf16.ok +++ b/regress/sbin/pfctl/pf16.ok @@ -2,4 +2,4 @@ scrub in on lo0 all fragment reassemble nat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1 rdr on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 -> 10.0.0.10 port 22 binat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1 -pass in on lo1 all +pass in on lo1000000 all diff --git a/regress/sbin/pfctl/pf17.in b/regress/sbin/pfctl/pf17.in index c593d5f8b8e..39ad77af803 100644 --- a/regress/sbin/pfctl/pf17.in +++ b/regress/sbin/pfctl/pf17.in @@ -18,21 +18,21 @@ binat on lo0 from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8 binat on lo0 from 1.1.1.1 to no-route -> 2.2.2.2 binat on lo0 from (lo0) to 1.1.1.1 -> 2.2.2.2 -binat on lo0 from (lo0) to 1.1.1.1 -> (lo1) -binat on lo0 inet from (lo0) to (lo1) -> (lo1) +binat on lo0 from (lo0) to 1.1.1.1 -> (lo1000000) +binat on lo0 inet from (lo0) to (lo1000000) -> (lo1000000) binat on lo0 from 1.1.1.1 to <sometable> -> 2.2.2.2 binat on lo0 from 1.1.1.1 to !<sometable> -> 2.2.2.2 -binat on lo0 from 1.1.1.1 to (lo1) -> 2.2.2.2 -binat on lo0 from 1.1.1.1 to !(lo1) -> 2.2.2.2 +binat on lo0 from 1.1.1.1 to (lo1000000) -> 2.2.2.2 +binat on lo0 from 1.1.1.1 to !(lo1000000) -> 2.2.2.2 binat on lo0 from (lo0) to <sometable> -> 2.2.2.2 binat on lo0 from ::1 to no-route -> ::2 binat on lo0 from (lo0) to ::1 -> ::2 -binat on lo0 from (lo0) to ::1 -> (lo1) -binat on lo0 inet6 from (lo0) to (lo1) -> (lo1) +binat on lo0 from (lo0) to ::1 -> (lo1000000) +binat on lo0 inet6 from (lo0) to (lo1000000) -> (lo1000000) binat on lo0 from ::1 to <sometable> -> ::2 binat on lo0 from ::1 to !<sometable> -> ::2 -binat on lo0 from ::1 to (lo1) -> ::2 -binat on lo0 from ::1 to !(lo1) -> ::2 +binat on lo0 from ::1 to (lo1000000) -> ::2 +binat on lo0 from ::1 to !(lo1000000) -> ::2 binat on lo0 from (lo0) to <sometable> -> ::2 diff --git a/regress/sbin/pfctl/pf17.loaded b/regress/sbin/pfctl/pf17.loaded index 0740408421b..800379f0c19 100644 --- a/regress/sbin/pfctl/pf17.loaded +++ b/regress/sbin/pfctl/pf17.loaded @@ -54,11 +54,11 @@ [ Skip steps: i=end d=end f=21 p=end sa=16 sp=end da=15 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 binat on lo0 inet from (lo0) to 1.1.1.1 -> (lo1) +@14 binat on lo0 inet from (lo0) to 1.1.1.1 -> (lo1000000) [ Skip steps: i=end d=end f=21 p=end sa=16 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 binat on lo0 inet from (lo0) to (lo1) -> (lo1) +@15 binat on lo0 inet from (lo0) to (lo1000000) -> (lo1000000) [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -70,11 +70,11 @@ [ Skip steps: i=end d=end f=21 p=end sa=20 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 binat on lo0 inet from 1.1.1.1 to (lo1) -> 2.2.2.2 +@18 binat on lo0 inet from 1.1.1.1 to (lo1000000) -> 2.2.2.2 [ Skip steps: i=end d=end f=21 p=end sa=20 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 binat on lo0 inet from 1.1.1.1 to ! (lo1) -> 2.2.2.2 +@19 binat on lo0 inet from 1.1.1.1 to ! (lo1000000) -> 2.2.2.2 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -90,11 +90,11 @@ [ Skip steps: i=end d=end f=end p=end sa=25 sp=end da=24 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@23 binat on lo0 inet6 from (lo0) to ::1 -> (lo1) +@23 binat on lo0 inet6 from (lo0) to ::1 -> (lo1000000) [ Skip steps: i=end d=end f=end p=end sa=25 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@24 binat on lo0 inet6 from (lo0) to (lo1) -> (lo1) +@24 binat on lo0 inet6 from (lo0) to (lo1000000) -> (lo1000000) [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -106,11 +106,11 @@ [ Skip steps: i=end d=end f=end p=end sa=29 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@27 binat on lo0 inet6 from ::1 to (lo1) -> ::2 +@27 binat on lo0 inet6 from ::1 to (lo1000000) -> ::2 [ Skip steps: i=end d=end f=end p=end sa=29 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@28 binat on lo0 inet6 from ::1 to ! (lo1) -> ::2 +@28 binat on lo0 inet6 from ::1 to ! (lo1000000) -> ::2 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf17.ok b/regress/sbin/pfctl/pf17.ok index 9f3e8adce14..32d22c3b25c 100644 --- a/regress/sbin/pfctl/pf17.ok +++ b/regress/sbin/pfctl/pf17.ok @@ -12,19 +12,19 @@ binat on lo0 inet from 192.168.2.0/30 to 192.168.3.1 -> 10.0.3.0/30 binat on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8 binat on lo0 inet from 1.1.1.1 to no-route -> 2.2.2.2 binat on lo0 inet from (lo0) to 1.1.1.1 -> 2.2.2.2 -binat on lo0 inet from (lo0) to 1.1.1.1 -> (lo1) -binat on lo0 inet from (lo0) to (lo1) -> (lo1) +binat on lo0 inet from (lo0) to 1.1.1.1 -> (lo1000000) +binat on lo0 inet from (lo0) to (lo1000000) -> (lo1000000) binat on lo0 inet from 1.1.1.1 to <sometable> -> 2.2.2.2 binat on lo0 inet from 1.1.1.1 to ! <sometable> -> 2.2.2.2 -binat on lo0 inet from 1.1.1.1 to (lo1) -> 2.2.2.2 -binat on lo0 inet from 1.1.1.1 to ! (lo1) -> 2.2.2.2 +binat on lo0 inet from 1.1.1.1 to (lo1000000) -> 2.2.2.2 +binat on lo0 inet from 1.1.1.1 to ! (lo1000000) -> 2.2.2.2 binat on lo0 inet from (lo0) to <sometable> -> 2.2.2.2 binat on lo0 inet6 from ::1 to no-route -> ::2 binat on lo0 inet6 from (lo0) to ::1 -> ::2 -binat on lo0 inet6 from (lo0) to ::1 -> (lo1) -binat on lo0 inet6 from (lo0) to (lo1) -> (lo1) +binat on lo0 inet6 from (lo0) to ::1 -> (lo1000000) +binat on lo0 inet6 from (lo0) to (lo1000000) -> (lo1000000) binat on lo0 inet6 from ::1 to <sometable> -> ::2 binat on lo0 inet6 from ::1 to ! <sometable> -> ::2 -binat on lo0 inet6 from ::1 to (lo1) -> ::2 -binat on lo0 inet6 from ::1 to ! (lo1) -> ::2 +binat on lo0 inet6 from ::1 to (lo1000000) -> ::2 +binat on lo0 inet6 from ::1 to ! (lo1000000) -> ::2 binat on lo0 inet6 from (lo0) to <sometable> -> ::2 diff --git a/regress/sbin/pfctl/pf18.in b/regress/sbin/pfctl/pf18.in index 6c1589cf2a6..9d19f7593e4 100644 --- a/regress/sbin/pfctl/pf18.in +++ b/regress/sbin/pfctl/pf18.in @@ -17,4 +17,4 @@ nat on lo0 from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8 nat on ! lo0 proto { udp, tcp } from any to any -> 10.0.0.8 static-port -nat on { lo0, tun0 } from any to any -> 10.0.0.8 +nat on { lo0, tun1000000 } from any to any -> 10.0.0.8 diff --git a/regress/sbin/pfctl/pf18.loaded b/regress/sbin/pfctl/pf18.loaded index 7744171a2e5..d21792e7f59 100644 --- a/regress/sbin/pfctl/pf18.loaded +++ b/regress/sbin/pfctl/pf18.loaded @@ -74,7 +74,7 @@ [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 nat on tun0 inet all -> 10.0.0.8 +@19 nat on tun1000000 inet all -> 10.0.0.8 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf18.ok b/regress/sbin/pfctl/pf18.ok index 0d9e9c884c2..56dce0ff03c 100644 --- a/regress/sbin/pfctl/pf18.ok +++ b/regress/sbin/pfctl/pf18.ok @@ -19,4 +19,4 @@ nat on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8 nat on ! lo0 inet proto udp all -> 10.0.0.8 static-port nat on ! lo0 inet proto tcp all -> 10.0.0.8 static-port nat on lo0 inet all -> 10.0.0.8 -nat on tun0 inet all -> 10.0.0.8 +nat on tun1000000 inet all -> 10.0.0.8 diff --git a/regress/sbin/pfctl/pf19.in b/regress/sbin/pfctl/pf19.in index 2a261c24d9c..b6ceaeaf868 100644 --- a/regress/sbin/pfctl/pf19.in +++ b/regress/sbin/pfctl/pf19.in @@ -1,5 +1,5 @@ EVIL = "lo0" -GOOD = "{ lo0, lo1 }" +GOOD = "{ lo0, lo1000000 }" GOOD_NET = "{ 127.0.0.0/24, 10.0.1.0/24 }" DEST_NET = "{ 1.2.3.4/25, 2.4.6.8/30 }" diff --git a/regress/sbin/pfctl/pf19.loaded b/regress/sbin/pfctl/pf19.loaded index 6ffb693a4a0..a190b649d3b 100644 --- a/regress/sbin/pfctl/pf19.loaded +++ b/regress/sbin/pfctl/pf19.loaded @@ -18,19 +18,19 @@ [ Skip steps: d=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 +@5 rdr on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 [ Skip steps: i=end d=end f=end p=end sa=7 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 +@6 rdr on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 +@7 rdr on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 +@8 rdr on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf19.ok b/regress/sbin/pfctl/pf19.ok index b57f610d04e..10202062464 100644 --- a/regress/sbin/pfctl/pf19.ok +++ b/regress/sbin/pfctl/pf19.ok @@ -1,5 +1,5 @@ EVIL = "lo0" -GOOD = "{ lo0, lo1 }" +GOOD = "{ lo0, lo1000000 }" GOOD_NET = "{ 127.0.0.0/24, 10.0.1.0/24 }" DEST_NET = "{ 1.2.3.4/25, 2.4.6.8/30 }" rdr on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 -> 10.0.0.10 port 22 @@ -7,7 +7,7 @@ rdr on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0. rdr on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 rdr on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 rdr on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 -rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 -rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 -rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 -rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 +rdr on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 +rdr on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 +rdr on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 +rdr on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 diff --git a/regress/sbin/pfctl/pf2.in b/regress/sbin/pfctl/pf2.in index dde077a91a7..bef5d9b08d1 100644 --- a/regress/sbin/pfctl/pf2.in +++ b/regress/sbin/pfctl/pf2.in @@ -1,34 +1,34 @@ # test -block out log on tun0 all -block in log on tun0 all +block out log on tun1000000 all +block in log on tun1000000 all -block return-rst out log on tun0 proto tcp all -block return-rst in log on tun0 proto tcp all -block return-icmp out log on tun0 proto udp all -block return-icmp in log on tun0 proto udp all +block return-rst out log on tun1000000 proto tcp all +block return-rst in log on tun1000000 proto tcp all +block return-icmp out log on tun1000000 proto udp all +block return-icmp in log on tun1000000 proto udp all -block out log quick on tun0 from ! 157.161.48.183 to any +block out log quick on tun1000000 from ! 157.161.48.183 to any -block in quick on tun0 from any to 255.255.255.255 +block in quick on tun1000000 from any to 255.255.255.255 -block in log quick on tun0 from 10.0.0.0/8 to any -block in log quick on tun0 from 172.16.0.0/12 to any -block in quick log on tun0 from 192.168.0.0/16 to any -block in quick log on tun0 from 255.255.255.255/32 to any +block in log quick on tun1000000 from 10.0.0.0/8 to any +block in log quick on tun1000000 from 172.16.0.0/12 to any +block in quick log on tun1000000 from 192.168.0.0/16 to any +block in quick log on tun1000000 from 255.255.255.255/32 to any block in log quick from no-route to any -pass out on tun0 inet proto icmp all icmp-type 8 code 0 keep state -pass in on tun0 inet proto icmp all icmp-type 8 code 0 keep state +pass out on tun1000000 inet proto icmp all icmp-type 8 code 0 keep state +pass in on tun1000000 inet proto icmp all icmp-type 8 code 0 keep state -pass out on tun0 proto udp all keep state +pass out on tun1000000 proto udp all keep state -pass in on tun0 proto udp from any to any port = domain keep state +pass in on tun1000000 proto udp from any to any port = domain keep state -pass out on tun0 proto tcp all keep state +pass out on tun1000000 proto tcp all keep state -pass in on tun0 proto tcp from any to any port = ssh keep state -pass in on tun0 proto tcp from any to any port = smtp keep state -pass in on tun0 proto tcp from any to any port = domain keep state -pass in on tun0 proto tcp from any to any port = auth keep state +pass in on tun1000000 proto tcp from any to any port = ssh keep state +pass in on tun1000000 proto tcp from any to any port = smtp keep state +pass in on tun1000000 proto tcp from any to any port = domain keep state +pass in on tun1000000 proto tcp from any to any port = auth keep state diff --git a/regress/sbin/pfctl/pf2.loaded b/regress/sbin/pfctl/pf2.loaded index fab67ef117e..42311e3b24d 100644 --- a/regress/sbin/pfctl/pf2.loaded +++ b/regress/sbin/pfctl/pf2.loaded @@ -1,48 +1,48 @@ -@0 block drop out log on tun0 all +@0 block drop out log on tun1000000 all [ Skip steps: i=12 f=6 p=2 sa=6 sp=end da=7 dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 block drop in log on tun0 all +@1 block drop in log on tun1000000 all [ Skip steps: i=12 f=6 sa=6 sp=end da=7 dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 block return-rst out log on tun0 proto tcp all +@2 block return-rst out log on tun1000000 proto tcp all [ Skip steps: i=12 f=6 p=4 sa=6 sp=end da=7 dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 block return-rst in log on tun0 proto tcp all +@3 block return-rst in log on tun1000000 proto tcp all [ Skip steps: i=12 f=6 sa=6 sp=end da=7 dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 block return-icmp(port-unr, port-unr) out log on tun0 proto udp all +@4 block return-icmp(port-unr, port-unr) out log on tun1000000 proto udp all [ Skip steps: i=12 f=6 p=6 sa=6 sp=end da=7 dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 block return-icmp(port-unr, port-unr) in log on tun0 proto udp all +@5 block return-icmp(port-unr, port-unr) in log on tun1000000 proto udp all [ Skip steps: i=12 sp=end da=7 dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 block drop out log quick on tun0 inet from ! 157.161.48.183 to any +@6 block drop out log quick on tun1000000 inet from ! 157.161.48.183 to any [ Skip steps: i=12 f=12 p=13 sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 block drop in quick on tun0 inet from any to 255.255.255.255 +@7 block drop in quick on tun1000000 inet from any to 255.255.255.255 [ Skip steps: i=12 d=13 f=12 p=13 sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 block drop in log quick on tun0 inet from 10.0.0.0/8 to any +@8 block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any [ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 block drop in log quick on tun0 inet from 172.16.0.0/12 to any +@9 block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any [ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 block drop in log quick on tun0 inet from 192.168.0.0/16 to any +@10 block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any [ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 block drop in log quick on tun0 inet from 255.255.255.255 to any +@11 block drop in log quick on tun1000000 inet from 255.255.255.255 to any [ Skip steps: d=13 p=13 sp=end da=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -50,39 +50,39 @@ [ Skip steps: sp=end da=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass out on tun0 inet proto icmp all icmp-type echoreq code 0 keep state +@13 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state [ Skip steps: i=end f=15 p=15 sa=end sp=end da=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass in on tun0 inet proto icmp all icmp-type echoreq code 0 keep state +@14 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state [ Skip steps: i=end sa=end sp=end da=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass out on tun0 proto udp all keep state +@15 pass out on tun1000000 proto udp all keep state [ Skip steps: i=end f=end p=17 sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass in on tun0 proto udp from any to any port = domain keep state +@16 pass in on tun1000000 proto udp from any to any port = domain keep state [ Skip steps: i=end f=end sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass out on tun0 proto tcp all keep state +@17 pass out on tun1000000 proto tcp all keep state [ Skip steps: i=end f=end p=end sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass in on tun0 proto tcp from any to any port = ssh keep state +@18 pass in on tun1000000 proto tcp from any to any port = ssh keep state [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass in on tun0 proto tcp from any to any port = smtp keep state +@19 pass in on tun1000000 proto tcp from any to any port = smtp keep state [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass in on tun0 proto tcp from any to any port = domain keep state +@20 pass in on tun1000000 proto tcp from any to any port = domain keep state [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass in on tun0 proto tcp from any to any port = auth keep state +@21 pass in on tun1000000 proto tcp from any to any port = auth keep state [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf2.ok b/regress/sbin/pfctl/pf2.ok index 7c9e4e0e1d8..6d43bf94569 100644 --- a/regress/sbin/pfctl/pf2.ok +++ b/regress/sbin/pfctl/pf2.ok @@ -1,22 +1,22 @@ -block drop out log on tun0 all -block drop in log on tun0 all -block return-rst out log on tun0 proto tcp all -block return-rst in log on tun0 proto tcp all -block return-icmp(port-unr, port-unr) out log on tun0 proto udp all -block return-icmp(port-unr, port-unr) in log on tun0 proto udp all -block drop out log quick on tun0 inet from ! 157.161.48.183 to any -block drop in quick on tun0 inet from any to 255.255.255.255 -block drop in log quick on tun0 inet from 10.0.0.0/8 to any -block drop in log quick on tun0 inet from 172.16.0.0/12 to any -block drop in log quick on tun0 inet from 192.168.0.0/16 to any -block drop in log quick on tun0 inet from 255.255.255.255 to any +block drop out log on tun1000000 all +block drop in log on tun1000000 all +block return-rst out log on tun1000000 proto tcp all +block return-rst in log on tun1000000 proto tcp all +block return-icmp(port-unr, port-unr) out log on tun1000000 proto udp all +block return-icmp(port-unr, port-unr) in log on tun1000000 proto udp all +block drop out log quick on tun1000000 inet from ! 157.161.48.183 to any +block drop in quick on tun1000000 inet from any to 255.255.255.255 +block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any +block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any +block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any +block drop in log quick on tun1000000 inet from 255.255.255.255 to any block drop in log quick from no-route to any -pass out on tun0 inet proto icmp all icmp-type echoreq code 0 keep state -pass in on tun0 inet proto icmp all icmp-type echoreq code 0 keep state -pass out on tun0 proto udp all keep state -pass in on tun0 proto udp from any to any port = domain keep state -pass out on tun0 proto tcp all keep state -pass in on tun0 proto tcp from any to any port = ssh keep state -pass in on tun0 proto tcp from any to any port = smtp keep state -pass in on tun0 proto tcp from any to any port = domain keep state -pass in on tun0 proto tcp from any to any port = auth keep state +pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state +pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state +pass out on tun1000000 proto udp all keep state +pass in on tun1000000 proto udp from any to any port = domain keep state +pass out on tun1000000 proto tcp all keep state +pass in on tun1000000 proto tcp from any to any port = ssh keep state +pass in on tun1000000 proto tcp from any to any port = smtp keep state +pass in on tun1000000 proto tcp from any to any port = domain keep state +pass in on tun1000000 proto tcp from any to any port = auth keep state diff --git a/regress/sbin/pfctl/pf20.in b/regress/sbin/pfctl/pf20.in index 274f01787bf..73438d467aa 100644 --- a/regress/sbin/pfctl/pf20.in +++ b/regress/sbin/pfctl/pf20.in @@ -1,7 +1,7 @@ # Test whether list expansion in NAT/RDR works correctly EVIL = "lo0" -GOOD = "{ lo0, lo1 }" +GOOD = "{ lo0, lo1000000 }" GOOD_NET = "{ 127.0.0.0/24, 10.0.1.0/24 }" DEST_NET = "{ 1.2.3.4/25, 2.4.6.8/30 }" diff --git a/regress/sbin/pfctl/pf20.loaded b/regress/sbin/pfctl/pf20.loaded index 57b63b937c0..f79e2fecddc 100644 --- a/regress/sbin/pfctl/pf20.loaded +++ b/regress/sbin/pfctl/pf20.loaded @@ -30,19 +30,19 @@ [ Skip steps: d=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 +@4 rdr on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 [ Skip steps: i=end d=end f=end p=end sa=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 +@5 rdr on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 +@6 rdr on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 +@7 rdr on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf20.ok b/regress/sbin/pfctl/pf20.ok index 44fb8c9d3e6..6c941d35f89 100644 --- a/regress/sbin/pfctl/pf20.ok +++ b/regress/sbin/pfctl/pf20.ok @@ -1,5 +1,5 @@ EVIL = "lo0" -GOOD = "{ lo0, lo1 }" +GOOD = "{ lo0, lo1000000 }" GOOD_NET = "{ 127.0.0.0/24, 10.0.1.0/24 }" DEST_NET = "{ 1.2.3.4/25, 2.4.6.8/30 }" nat on lo0 inet from 127.0.0.0/24 to 1.2.3.0/25 -> 127.0.0.1 @@ -10,7 +10,7 @@ rdr on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0. rdr on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 rdr on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 rdr on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 -rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 -rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 -rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 -rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 +rdr on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 +rdr on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 +rdr on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021 +rdr on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021 diff --git a/regress/sbin/pfctl/pf37.in b/regress/sbin/pfctl/pf37.in index 8d71adb0533..9d65f3e3fb7 100644 --- a/regress/sbin/pfctl/pf37.in +++ b/regress/sbin/pfctl/pf37.in @@ -1,5 +1,5 @@ #test altq with interface expansion #also tests multiple queues with the same name but on different interfaces -altq on { lo0 lo1 } tbrsize 1824 cbq bandwidth 10Mb queue std +altq on { lo0 lo1000000 } tbrsize 1824 cbq bandwidth 10Mb queue std queue std cbq(default) diff --git a/regress/sbin/pfctl/pf37.ok b/regress/sbin/pfctl/pf37.ok index d8013dcc83a..13e63197d2e 100644 --- a/regress/sbin/pfctl/pf37.ok +++ b/regress/sbin/pfctl/pf37.ok @@ -1,3 +1,3 @@ altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { std } -altq on lo1 cbq bandwidth 10Mb tbrsize 1824 queue { std } +altq on lo1000000 cbq bandwidth 10Mb tbrsize 1824 queue { std } queue std cbq( default ) diff --git a/regress/sbin/pfctl/pf38.in b/regress/sbin/pfctl/pf38.in index bf67308a9c2..1e63d6e5e26 100644 --- a/regress/sbin/pfctl/pf38.in +++ b/regress/sbin/pfctl/pf38.in @@ -1,5 +1,5 @@ # test -pass in on tun0 proto tcp from any to any user bin -pass in on tun0 proto tcp from any to any group bin -pass in on tun0 proto tcp from any to any group wheel user root user bin +pass in on tun1000000 proto tcp from any to any user bin +pass in on tun1000000 proto tcp from any to any group bin +pass in on tun1000000 proto tcp from any to any group wheel user root user bin diff --git a/regress/sbin/pfctl/pf38.loaded b/regress/sbin/pfctl/pf38.loaded index 237cacdff6f..3ca12c9642c 100644 --- a/regress/sbin/pfctl/pf38.loaded +++ b/regress/sbin/pfctl/pf38.loaded @@ -1,16 +1,16 @@ -@0 pass in on tun0 proto tcp all user = 3 +@0 pass in on tun1000000 proto tcp all user = 3 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on tun0 proto tcp all group = 7 +@1 pass in on tun1000000 proto tcp all group = 7 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on tun0 proto tcp all user = 3 group = 0 +@2 pass in on tun1000000 proto tcp all user = 3 group = 0 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on tun0 proto tcp all user = 0 group = 0 +@3 pass in on tun1000000 proto tcp all user = 0 group = 0 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf38.ok b/regress/sbin/pfctl/pf38.ok index 09a548991d9..e0d567304fb 100644 --- a/regress/sbin/pfctl/pf38.ok +++ b/regress/sbin/pfctl/pf38.ok @@ -1,4 +1,4 @@ -pass in on tun0 proto tcp all user = 3 -pass in on tun0 proto tcp all group = 7 -pass in on tun0 proto tcp all user = 3 group = 0 -pass in on tun0 proto tcp all user = 0 group = 0 +pass in on tun1000000 proto tcp all user = 3 +pass in on tun1000000 proto tcp all group = 7 +pass in on tun1000000 proto tcp all user = 3 group = 0 +pass in on tun1000000 proto tcp all user = 0 group = 0 diff --git a/regress/sbin/pfctl/pf58.in b/regress/sbin/pfctl/pf58.in index 9f99e22051d..831b90bb3d9 100644 --- a/regress/sbin/pfctl/pf58.in +++ b/regress/sbin/pfctl/pf58.in @@ -1,7 +1,7 @@ # queue on two interfaces -altq on ppp0 bandwidth 100Kb cbq queue { std ssh } -altq on gif3 bandwidth 10Mb cbq queue { blah ssh } +altq on tun1000000 bandwidth 100Kb cbq queue { std ssh } +altq on tun1000001 bandwidth 10Mb cbq queue { blah ssh } queue std bandwidth 10% cbq(borrow, default) queue ssh bandwidth 30% cbq(borrow) { ssh2 } queue ssh2 bandwidth 80% diff --git a/regress/sbin/pfctl/pf58.ok b/regress/sbin/pfctl/pf58.ok index 942d7b2a533..d9dd4e2ccf1 100644 --- a/regress/sbin/pfctl/pf58.ok +++ b/regress/sbin/pfctl/pf58.ok @@ -1,5 +1,5 @@ -altq on ppp0 cbq bandwidth 100Kb tbrsize 1500 queue { std ssh } -altq on gif3 cbq bandwidth 10Mb tbrsize 5120 queue { blah ssh } +altq on tun1000000 cbq bandwidth 100Kb tbrsize 3000 queue { std ssh } +altq on tun1000001 cbq bandwidth 10Mb tbrsize 12000 queue { blah ssh } queue std bandwidth 10% cbq( borrow default ) queue ssh bandwidth 30% cbq( borrow ) { ssh2 } queue ssh2 bandwidth 80% diff --git a/regress/sbin/pfctl/pf59.in b/regress/sbin/pfctl/pf59.in index 880f1fa7a61..e6d16317fe8 100644 --- a/regress/sbin/pfctl/pf59.in +++ b/regress/sbin/pfctl/pf59.in @@ -1,4 +1,4 @@ #tests an edge case in LOOP_THROUGH behaviour, the one loop despite the #list is empty -altq on { lo0 tun0 } priq bandwidth 10Mb tbrsize 1824 queue q_def +altq on { lo0 tun1000000 } priq bandwidth 10Mb tbrsize 1824 queue q_def queue q_def priq(default) diff --git a/regress/sbin/pfctl/pf59.ok b/regress/sbin/pfctl/pf59.ok index 186c72d2c40..c7d9cd8300a 100644 --- a/regress/sbin/pfctl/pf59.ok +++ b/regress/sbin/pfctl/pf59.ok @@ -1,3 +1,3 @@ altq on lo0 priq bandwidth 10Mb tbrsize 1824 queue { q_def } -altq on tun0 priq bandwidth 10Mb tbrsize 1824 queue { q_def } +altq on tun1000000 priq bandwidth 10Mb tbrsize 1824 queue { q_def } queue q_def priq( default ) diff --git a/regress/sbin/pfctl/pf64.in b/regress/sbin/pfctl/pf64.in index 282971b841c..b80a5885eba 100644 --- a/regress/sbin/pfctl/pf64.in +++ b/regress/sbin/pfctl/pf64.in @@ -2,7 +2,7 @@ # try to provoke them altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei } -altq on tun0 tbrsize 1824 bandwidth 100Mb hfsc queue { eins zwei drei } +altq on tun1000000 tbrsize 1824 bandwidth 100Mb hfsc queue { eins zwei drei } queue eins bandwidth 10% hfsc(default linkshare(20% 20 5%) realtime 500Kb) queue zwei bandwidth 40% hfsc(linkshare(35% 10 25%) upperlimit 5Mb) queue drei bandwidth 50% hfsc(linkshare(60% 20 4Mb) \ diff --git a/regress/sbin/pfctl/pf64.ok b/regress/sbin/pfctl/pf64.ok index a6ef4ccf880..35814ec5317 100644 --- a/regress/sbin/pfctl/pf64.ok +++ b/regress/sbin/pfctl/pf64.ok @@ -1,5 +1,5 @@ altq on lo0 hfsc bandwidth 10Mb tbrsize 1824 queue { eins zwei drei } -altq on tun0 hfsc bandwidth 100Mb tbrsize 1824 queue { eins zwei drei } +altq on tun1000000 hfsc bandwidth 100Mb tbrsize 1824 queue { eins zwei drei } queue eins bandwidth 10% hfsc( default realtime 500Kb linkshare(20% 20 5%) ) queue zwei bandwidth 40% hfsc( linkshare(35% 10 25%) upperlimit 5Mb ) queue drei bandwidth 50% hfsc( linkshare(60% 20 4Mb) upperlimit(65% 10 45%) ) diff --git a/regress/sbin/pfctl/pf67.in b/regress/sbin/pfctl/pf67.in index b9c557bbcb9..4594420aff0 100644 --- a/regress/sbin/pfctl/pf67.in +++ b/regress/sbin/pfctl/pf67.in @@ -1,3 +1,3 @@ -pass in quick on tun0 keep state tag regress +pass in quick on tun1000000 keep state tag regress pass out quick on lo0 keep state tagged regress diff --git a/regress/sbin/pfctl/pf67.loaded b/regress/sbin/pfctl/pf67.loaded index a448ee6e46a..68cc9cb7def 100644 --- a/regress/sbin/pfctl/pf67.loaded +++ b/regress/sbin/pfctl/pf67.loaded @@ -1,4 +1,4 @@ -@0 pass in quick on tun0 all keep state tag regress +@0 pass in quick on tun1000000 all keep state tag regress [ Skip steps: f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf67.ok b/regress/sbin/pfctl/pf67.ok index d0b9f865075..f245c3eb404 100644 --- a/regress/sbin/pfctl/pf67.ok +++ b/regress/sbin/pfctl/pf67.ok @@ -1,2 +1,2 @@ -pass in quick on tun0 all keep state tag regress +pass in quick on tun1000000 all keep state tag regress pass out quick on lo0 all keep state tagged regress diff --git a/regress/sbin/pfctl/pf68.in b/regress/sbin/pfctl/pf68.in index 1dcec675477..273a91cb917 100644 --- a/regress/sbin/pfctl/pf68.in +++ b/regress/sbin/pfctl/pf68.in @@ -9,8 +9,8 @@ scrub in proto tcp all fragment reassemble scrub in proto tcp from { <regress.1> !<regress.2> } to any scrub in inet proto tcp from { 10.0.0.1, 10.0.0.2 } to { 10.0.0.3, 10.0.0.4 } scrub in log on lo0 proto tcp from any to any min-ttl 25 -scrub in log on lo0 inet6 proto tcp from { (lo1), (lo0) } to 2000::1 -scrub in log on {lo0 lo1} proto tcp from any to any +scrub in log on lo0 inet6 proto tcp from { (lo1000000), (lo0) } to 2000::1 +scrub in log on {lo0 lo1000000} proto tcp from any to any scrub in on lo0 proto tcp all scrub in on lo0 proto tcp from any to any fragment reassemble max-mss 224 min-ttl 15 no-df scrub in on lo0 proto tcp from any to any max-mss 224 @@ -24,15 +24,15 @@ scrub in on lo0 inet proto tcp from (lo0) to any scrub on lo0 proto tcp from any to any max-mss 224 scrub out proto tcp scrub out proto tcp from any to { !<regress.1>, <regress.2> } -scrub out log on lo1 proto tcp from any to 10.0.0.1 no-df max-mss 224 +scrub out log on lo1000000 proto tcp from any to 10.0.0.1 no-df max-mss 224 scrub proto tcp random-id scrub proto tcp from any to any port 80 scrub in proto tcp from { <regress.1> !<regress.2> } to any port 80 scrub in inet proto tcp from { 10.0.0.1, 10.0.0.2 } to { 10.0.0.3, 10.0.0.4 } port 80 scrub in log on lo0 proto tcp from any to any port 80 min-ttl 25 -scrub in log on lo0 inet6 proto tcp from { (lo1), (lo0) } port 80 to 2000::1 -scrub in log on {lo0 lo1} proto tcp from any port 80 to any +scrub in log on lo0 inet6 proto tcp from { (lo1000000), (lo0) } port 80 to 2000::1 +scrub in log on {lo0 lo1000000} proto tcp from any port 80 to any scrub in on lo0 proto tcp from any port {80, 81} to any fragment reassemble max-mss 224 min-ttl 15 no-df scrub in on lo0 proto tcp from any to any port 80 max-mss 224 scrub in on lo0 proto tcp from any port 80 to any max-mss 224 min-ttl 15 no-df fragment reassemble @@ -44,4 +44,4 @@ scrub in on lo0 proto tcp from any to any port 83 no-df max-mss 224 min-ttl 15 scrub in on lo0 inet proto tcp from (lo0) port 80 to any scrub on lo0 proto tcp from any to any port 80 max-mss 224 scrub out proto tcp from any to { !<regress.1>, <regress.2> } port 80 -scrub out log on lo1 proto tcp from any to 10.0.0.1 port 80 no-df max-mss 224 +scrub out log on lo1000000 proto tcp from any to 10.0.0.1 port 80 no-df max-mss 224 diff --git a/regress/sbin/pfctl/pf68.loaded b/regress/sbin/pfctl/pf68.loaded index dd189977ca8..8be3060543a 100644 --- a/regress/sbin/pfctl/pf68.loaded +++ b/regress/sbin/pfctl/pf68.loaded @@ -58,7 +58,7 @@ [ Skip steps: i=18 d=29 p=end sp=43 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 scrub in log on lo0 inet6 proto tcp from (lo1) to 2000::1 fragment reassemble +@15 scrub in log on lo0 inet6 proto tcp from (lo1000000) to 2000::1 fragment reassemble [ Skip steps: i=18 d=29 f=17 p=end sp=43 da=17 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -70,7 +70,7 @@ [ Skip steps: d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 scrub in log on lo1 proto tcp all fragment reassemble +@18 scrub in log on lo1000000 proto tcp all fragment reassemble [ Skip steps: d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -130,7 +130,7 @@ [ Skip steps: d=34 p=end sa=36 sp=43 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@33 scrub out log on lo1 inet proto tcp from any to 10.0.0.1 no-df max-mss 224 fragment reassemble +@33 scrub out log on lo1000000 inet proto tcp from any to 10.0.0.1 no-df max-mss 224 fragment reassemble [ Skip steps: p=end sa=36 sp=43 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -170,7 +170,7 @@ [ Skip steps: i=46 d=62 p=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@43 scrub in log on lo0 inet6 proto tcp from (lo1) port = www to 2000::1 fragment reassemble +@43 scrub in log on lo0 inet6 proto tcp from (lo1000000) port = www to 2000::1 fragment reassemble [ Skip steps: i=46 d=62 f=45 p=end sp=48 da=45 dp=49 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -182,7 +182,7 @@ [ Skip steps: d=62 f=61 p=end sa=61 sp=48 da=63 dp=49 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@46 scrub in log on lo1 proto tcp from any port = www to any fragment reassemble +@46 scrub in log on lo1000000 proto tcp from any port = www to any fragment reassemble [ Skip steps: d=62 f=61 p=end sa=61 sp=48 da=63 dp=49 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -258,7 +258,7 @@ [ Skip steps: d=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@65 scrub out log on lo1 inet proto tcp from any to 10.0.0.1 port = www no-df max-mss 224 fragment reassemble +@65 scrub out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www no-df max-mss 224 fragment reassemble [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf68.ok b/regress/sbin/pfctl/pf68.ok index b813fef16aa..ec333425a8f 100644 --- a/regress/sbin/pfctl/pf68.ok +++ b/regress/sbin/pfctl/pf68.ok @@ -13,10 +13,10 @@ scrub in inet proto tcp from 10.0.0.1 to 10.0.0.4 fragment reassemble scrub in inet proto tcp from 10.0.0.2 to 10.0.0.3 fragment reassemble scrub in inet proto tcp from 10.0.0.2 to 10.0.0.4 fragment reassemble scrub in log on lo0 proto tcp all min-ttl 25 fragment reassemble -scrub in log on lo0 inet6 proto tcp from (lo1) to 2000::1 fragment reassemble +scrub in log on lo0 inet6 proto tcp from (lo1000000) to 2000::1 fragment reassemble scrub in log on lo0 inet6 proto tcp from (lo0) to 2000::1 fragment reassemble scrub in log on lo0 proto tcp all fragment reassemble -scrub in log on lo1 proto tcp all fragment reassemble +scrub in log on lo1000000 proto tcp all fragment reassemble scrub in on lo0 proto tcp all fragment reassemble scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment reassemble scrub in on lo0 proto tcp all max-mss 224 fragment reassemble @@ -31,7 +31,7 @@ scrub on lo0 proto tcp all max-mss 224 fragment reassemble scrub out proto tcp all fragment reassemble scrub out proto tcp from any to ! <regress.1> fragment reassemble scrub out proto tcp from any to <regress.2> fragment reassemble -scrub out log on lo1 inet proto tcp from any to 10.0.0.1 no-df max-mss 224 fragment reassemble +scrub out log on lo1000000 inet proto tcp from any to 10.0.0.1 no-df max-mss 224 fragment reassemble scrub proto tcp all random-id fragment reassemble scrub proto tcp from any to any port = www fragment reassemble scrub in proto tcp from <regress.1> to any port = www fragment reassemble @@ -41,10 +41,10 @@ scrub in inet proto tcp from 10.0.0.1 to 10.0.0.4 port = www fragment reassemble scrub in inet proto tcp from 10.0.0.2 to 10.0.0.3 port = www fragment reassemble scrub in inet proto tcp from 10.0.0.2 to 10.0.0.4 port = www fragment reassemble scrub in log on lo0 proto tcp from any to any port = www min-ttl 25 fragment reassemble -scrub in log on lo0 inet6 proto tcp from (lo1) port = www to 2000::1 fragment reassemble +scrub in log on lo0 inet6 proto tcp from (lo1000000) port = www to 2000::1 fragment reassemble scrub in log on lo0 inet6 proto tcp from (lo0) port = www to 2000::1 fragment reassemble scrub in log on lo0 proto tcp from any port = www to any fragment reassemble -scrub in log on lo1 proto tcp from any port = www to any fragment reassemble +scrub in log on lo1000000 proto tcp from any port = www to any fragment reassemble scrub in on lo0 proto tcp from any port = www to any no-df min-ttl 15 max-mss 224 fragment reassemble scrub in on lo0 proto tcp from any port = 81 to any no-df min-ttl 15 max-mss 224 fragment reassemble scrub in on lo0 proto tcp from any to any port = www max-mss 224 fragment reassemble @@ -63,4 +63,4 @@ scrub in on lo0 inet proto tcp from (lo0) port = www to any fragment reassemble scrub on lo0 proto tcp from any to any port = www max-mss 224 fragment reassemble scrub out proto tcp from any to ! <regress.1> port = www fragment reassemble scrub out proto tcp from any to <regress.2> port = www fragment reassemble -scrub out log on lo1 inet proto tcp from any to 10.0.0.1 port = www no-df max-mss 224 fragment reassemble +scrub out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www no-df max-mss 224 fragment reassemble diff --git a/regress/sbin/pfctl/pf7.in b/regress/sbin/pfctl/pf7.in index 698a6f20ba4..1ce5b162236 100644 --- a/regress/sbin/pfctl/pf7.in +++ b/regress/sbin/pfctl/pf7.in @@ -1,32 +1,32 @@ # test modulate state -block out log on tun0 all -block in log on tun0 all +block out log on tun1000000 all +block in log on tun1000000 all -block return-rst out log on tun0 proto tcp all -block return-rst in log on tun0 proto tcp all -block return-icmp out log on tun0 proto udp all -block return-icmp in log on tun0 proto udp all +block return-rst out log on tun1000000 proto tcp all +block return-rst in log on tun1000000 proto tcp all +block return-icmp out log on tun1000000 proto udp all +block return-icmp in log on tun1000000 proto udp all -block out log quick on tun0 from ! 157.161.48.183 to any +block out log quick on tun1000000 from ! 157.161.48.183 to any -block in quick on tun0 from any to 255.255.255.255 +block in quick on tun1000000 from any to 255.255.255.255 -block in log quick on tun0 from 10.0.0.0/8 to any -block in log quick on tun0 from 172.16.0.0/12 to any -block in log quick on tun0 from 192.168.0.0/16 to any -block in log quick on tun0 from 255.255.255.255/32 to any +block in log quick on tun1000000 from 10.0.0.0/8 to any +block in log quick on tun1000000 from 172.16.0.0/12 to any +block in log quick on tun1000000 from 192.168.0.0/16 to any +block in log quick on tun1000000 from 255.255.255.255/32 to any -pass out on tun0 inet proto icmp all icmp-type 8 code 0 keep state -pass in on tun0 inet proto icmp all icmp-type 8 code 0 keep state +pass out on tun1000000 inet proto icmp all icmp-type 8 code 0 keep state +pass in on tun1000000 inet proto icmp all icmp-type 8 code 0 keep state -pass out on tun0 proto udp all keep state +pass out on tun1000000 proto udp all keep state -pass in on tun0 proto udp from any to any port = domain keep state +pass in on tun1000000 proto udp from any to any port = domain keep state -pass out on tun0 proto tcp all modulate state +pass out on tun1000000 proto tcp all modulate state -pass in on tun0 proto tcp from any to any port = ssh modulate state -pass in on tun0 proto tcp from any to any port = smtp modulate state -pass in on tun0 proto tcp from any to any port = domain modulate state -pass in on tun0 proto tcp from any to any port = auth modulate state +pass in on tun1000000 proto tcp from any to any port = ssh modulate state +pass in on tun1000000 proto tcp from any to any port = smtp modulate state +pass in on tun1000000 proto tcp from any to any port = domain modulate state +pass in on tun1000000 proto tcp from any to any port = auth modulate state diff --git a/regress/sbin/pfctl/pf7.loaded b/regress/sbin/pfctl/pf7.loaded index 6b415cd6360..979319d5d97 100644 --- a/regress/sbin/pfctl/pf7.loaded +++ b/regress/sbin/pfctl/pf7.loaded @@ -1,84 +1,84 @@ -@0 block drop out log on tun0 all +@0 block drop out log on tun1000000 all [ Skip steps: i=end f=6 p=2 sa=6 sp=end da=7 dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 block drop in log on tun0 all +@1 block drop in log on tun1000000 all [ Skip steps: i=end f=6 sa=6 sp=end da=7 dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 block return-rst out log on tun0 proto tcp all +@2 block return-rst out log on tun1000000 proto tcp all [ Skip steps: i=end f=6 p=4 sa=6 sp=end da=7 dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 block return-rst in log on tun0 proto tcp all +@3 block return-rst in log on tun1000000 proto tcp all [ Skip steps: i=end f=6 sa=6 sp=end da=7 dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 block return-icmp(port-unr, port-unr) out log on tun0 proto udp all +@4 block return-icmp(port-unr, port-unr) out log on tun1000000 proto udp all [ Skip steps: i=end f=6 p=6 sa=6 sp=end da=7 dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 block return-icmp(port-unr, port-unr) in log on tun0 proto udp all +@5 block return-icmp(port-unr, port-unr) in log on tun1000000 proto udp all [ Skip steps: i=end sp=end da=7 dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 block drop out log quick on tun0 inet from ! 157.161.48.183 to any +@6 block drop out log quick on tun1000000 inet from ! 157.161.48.183 to any [ Skip steps: i=end f=14 p=12 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 block drop in quick on tun0 inet from any to 255.255.255.255 +@7 block drop in quick on tun1000000 inet from any to 255.255.255.255 [ Skip steps: i=end d=12 f=14 p=12 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 block drop in log quick on tun0 inet from 10.0.0.0/8 to any +@8 block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any [ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 block drop in log quick on tun0 inet from 172.16.0.0/12 to any +@9 block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any [ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 block drop in log quick on tun0 inet from 192.168.0.0/16 to any +@10 block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any [ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 block drop in log quick on tun0 inet from 255.255.255.255 to any +@11 block drop in log quick on tun1000000 inet from 255.255.255.255 to any [ Skip steps: i=end f=14 sp=end da=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass out on tun0 inet proto icmp all icmp-type echoreq code 0 keep state +@12 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state [ Skip steps: i=end f=14 p=14 sa=end sp=end da=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass in on tun0 inet proto icmp all icmp-type echoreq code 0 keep state +@13 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state [ Skip steps: i=end sa=end sp=end da=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass out on tun0 proto udp all keep state +@14 pass out on tun1000000 proto udp all keep state [ Skip steps: i=end f=end p=16 sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in on tun0 proto udp from any to any port = domain keep state +@15 pass in on tun1000000 proto udp from any to any port = domain keep state [ Skip steps: i=end f=end sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass out on tun0 proto tcp all modulate state +@16 pass out on tun1000000 proto tcp all modulate state [ Skip steps: i=end f=end p=end sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass in on tun0 proto tcp from any to any port = ssh modulate state +@17 pass in on tun1000000 proto tcp from any to any port = ssh modulate state [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass in on tun0 proto tcp from any to any port = smtp modulate state +@18 pass in on tun1000000 proto tcp from any to any port = smtp modulate state [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass in on tun0 proto tcp from any to any port = domain modulate state +@19 pass in on tun1000000 proto tcp from any to any port = domain modulate state [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass in on tun0 proto tcp from any to any port = auth modulate state +@20 pass in on tun1000000 proto tcp from any to any port = auth modulate state [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf7.ok b/regress/sbin/pfctl/pf7.ok index 53986a92aac..dfe7573a1bc 100644 --- a/regress/sbin/pfctl/pf7.ok +++ b/regress/sbin/pfctl/pf7.ok @@ -1,21 +1,21 @@ -block drop out log on tun0 all -block drop in log on tun0 all -block return-rst out log on tun0 proto tcp all -block return-rst in log on tun0 proto tcp all -block return-icmp(port-unr, port-unr) out log on tun0 proto udp all -block return-icmp(port-unr, port-unr) in log on tun0 proto udp all -block drop out log quick on tun0 inet from ! 157.161.48.183 to any -block drop in quick on tun0 inet from any to 255.255.255.255 -block drop in log quick on tun0 inet from 10.0.0.0/8 to any -block drop in log quick on tun0 inet from 172.16.0.0/12 to any -block drop in log quick on tun0 inet from 192.168.0.0/16 to any -block drop in log quick on tun0 inet from 255.255.255.255 to any -pass out on tun0 inet proto icmp all icmp-type echoreq code 0 keep state -pass in on tun0 inet proto icmp all icmp-type echoreq code 0 keep state -pass out on tun0 proto udp all keep state -pass in on tun0 proto udp from any to any port = domain keep state -pass out on tun0 proto tcp all modulate state -pass in on tun0 proto tcp from any to any port = ssh modulate state -pass in on tun0 proto tcp from any to any port = smtp modulate state -pass in on tun0 proto tcp from any to any port = domain modulate state -pass in on tun0 proto tcp from any to any port = auth modulate state +block drop out log on tun1000000 all +block drop in log on tun1000000 all +block return-rst out log on tun1000000 proto tcp all +block return-rst in log on tun1000000 proto tcp all +block return-icmp(port-unr, port-unr) out log on tun1000000 proto udp all +block return-icmp(port-unr, port-unr) in log on tun1000000 proto udp all +block drop out log quick on tun1000000 inet from ! 157.161.48.183 to any +block drop in quick on tun1000000 inet from any to 255.255.255.255 +block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any +block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any +block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any +block drop in log quick on tun1000000 inet from 255.255.255.255 to any +pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state +pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state +pass out on tun1000000 proto udp all keep state +pass in on tun1000000 proto udp from any to any port = domain keep state +pass out on tun1000000 proto tcp all modulate state +pass in on tun1000000 proto tcp from any to any port = ssh modulate state +pass in on tun1000000 proto tcp from any to any port = smtp modulate state +pass in on tun1000000 proto tcp from any to any port = domain modulate state +pass in on tun1000000 proto tcp from any to any port = auth modulate state diff --git a/regress/sbin/pfctl/pf73.in b/regress/sbin/pfctl/pf73.in index 131756eef24..2a60c440c0d 100644 --- a/regress/sbin/pfctl/pf73.in +++ b/regress/sbin/pfctl/pf73.in @@ -7,7 +7,7 @@ scrub proto tcp all reassemble tcp fragment reassemble scrub proto tcp from { <regress.1> !<regress.2> } to any reassemble tcp scrub inet proto tcp from { 10.0.0.1, 10.0.0.2 } to { 10.0.0.3, 10.0.0.4 } reassemble tcp scrub log on lo0 proto tcp from any to any min-ttl 25 reassemble tcp -scrub log on lo0 inet6 proto tcp from { (lo1), (lo0) } to 2000::1 reassemble tcp -scrub log on {lo0 lo1} proto tcp from any to any reassemble tcp +scrub log on lo0 inet6 proto tcp from { (lo1000000), (lo0) } to 2000::1 reassemble tcp +scrub log on {lo0 lo1000000} proto tcp from any to any reassemble tcp scrub on lo0 proto tcp all reassemble tcp scrub on lo0 proto tcp from any to any fragment reassemble max-mss 224 min-ttl 15 no-df reassemble tcp diff --git a/regress/sbin/pfctl/pf73.loaded b/regress/sbin/pfctl/pf73.loaded index ea32bb73c52..c18f1064b94 100644 --- a/regress/sbin/pfctl/pf73.loaded +++ b/regress/sbin/pfctl/pf73.loaded @@ -50,7 +50,7 @@ [ Skip steps: i=16 d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 scrub log on lo0 inet6 proto tcp from (lo1) to 2000::1 reassemble tcp fragment reassemble +@13 scrub log on lo0 inet6 proto tcp from (lo1000000) to 2000::1 reassemble tcp fragment reassemble [ Skip steps: i=16 d=end f=15 p=end sp=end da=15 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -62,7 +62,7 @@ [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 scrub log on lo1 proto tcp all reassemble tcp fragment reassemble +@16 scrub log on lo1000000 proto tcp all reassemble tcp fragment reassemble [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf73.ok b/regress/sbin/pfctl/pf73.ok index b74dd1298b8..beb4f17d1d7 100644 --- a/regress/sbin/pfctl/pf73.ok +++ b/regress/sbin/pfctl/pf73.ok @@ -11,9 +11,9 @@ scrub inet proto tcp from 10.0.0.1 to 10.0.0.4 reassemble tcp fragment reassembl scrub inet proto tcp from 10.0.0.2 to 10.0.0.3 reassemble tcp fragment reassemble scrub inet proto tcp from 10.0.0.2 to 10.0.0.4 reassemble tcp fragment reassemble scrub log on lo0 proto tcp all min-ttl 25 reassemble tcp fragment reassemble -scrub log on lo0 inet6 proto tcp from (lo1) to 2000::1 reassemble tcp fragment reassemble +scrub log on lo0 inet6 proto tcp from (lo1000000) to 2000::1 reassemble tcp fragment reassemble scrub log on lo0 inet6 proto tcp from (lo0) to 2000::1 reassemble tcp fragment reassemble scrub log on lo0 proto tcp all reassemble tcp fragment reassemble -scrub log on lo1 proto tcp all reassemble tcp fragment reassemble +scrub log on lo1000000 proto tcp all reassemble tcp fragment reassemble scrub on lo0 proto tcp all reassemble tcp fragment reassemble scrub on lo0 proto tcp all no-df min-ttl 15 max-mss 224 reassemble tcp fragment reassemble diff --git a/regress/sbin/pfctl/pf8.in b/regress/sbin/pfctl/pf8.in index 4276a9bb470..e092bd955af 100644 --- a/regress/sbin/pfctl/pf8.in +++ b/regress/sbin/pfctl/pf8.in @@ -1,2 +1,2 @@ extern = "{ ! 10.0.0.0/8, 10.1.2.3 }" -block out log on tun1 from $extern to any +block out log on tun1000001 from $extern to any diff --git a/regress/sbin/pfctl/pf8.loaded b/regress/sbin/pfctl/pf8.loaded index cc31f73bdd5..ecadb4f064c 100644 --- a/regress/sbin/pfctl/pf8.loaded +++ b/regress/sbin/pfctl/pf8.loaded @@ -1,8 +1,8 @@ -@0 block drop out log on tun1 inet from ! 10.0.0.0/8 to any +@0 block drop out log on tun1000001 inet from ! 10.0.0.0/8 to any [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 block drop out log on tun1 inet from 10.1.2.3 to any +@1 block drop out log on tun1000001 inet from 10.1.2.3 to any [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf8.ok b/regress/sbin/pfctl/pf8.ok index 5f3361f70a1..c8786e384cc 100644 --- a/regress/sbin/pfctl/pf8.ok +++ b/regress/sbin/pfctl/pf8.ok @@ -1,3 +1,3 @@ extern = "{ ! 10.0.0.0/8, 10.1.2.3 }" -block drop out log on tun1 inet from ! 10.0.0.0/8 to any -block drop out log on tun1 inet from 10.1.2.3 to any +block drop out log on tun1000001 inet from ! 10.0.0.0/8 to any +block drop out log on tun1000001 inet from 10.1.2.3 to any diff --git a/regress/sbin/pfctl/pf83.in b/regress/sbin/pfctl/pf83.in index a03dad14031..5b1e1de0c11 100644 --- a/regress/sbin/pfctl/pf83.in +++ b/regress/sbin/pfctl/pf83.in @@ -1,3 +1,3 @@ # test antispoof with ip-less interface -antispoof for lo1 +antispoof for lo1000000 diff --git a/regress/sbin/pfctl/pf9.in b/regress/sbin/pfctl/pf9.in index 2468400b7f4..2e4e724dbb8 100644 --- a/regress/sbin/pfctl/pf9.in +++ b/regress/sbin/pfctl/pf9.in @@ -1,3 +1,3 @@ -interfaces = "{ enc0, tun0 }" +interfaces = "{ enc0, tun1000000 }" block in on $interfaces all diff --git a/regress/sbin/pfctl/pf9.loaded b/regress/sbin/pfctl/pf9.loaded index 10c7a7e20ee..8c6247c4e7f 100644 --- a/regress/sbin/pfctl/pf9.loaded +++ b/regress/sbin/pfctl/pf9.loaded @@ -2,7 +2,7 @@ [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 block drop in on tun0 all +@1 block drop in on tun1000000 all [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf9.ok b/regress/sbin/pfctl/pf9.ok index 30560d8fe72..c7e9547a8fd 100644 --- a/regress/sbin/pfctl/pf9.ok +++ b/regress/sbin/pfctl/pf9.ok @@ -1,3 +1,3 @@ -interfaces = "{ enc0, tun0 }" +interfaces = "{ enc0, tun1000000 }" block drop in on enc0 all -block drop in on tun0 all +block drop in on tun1000000 all diff --git a/regress/sbin/pfctl/pfail10.in b/regress/sbin/pfctl/pfail10.in index 507e6df0366..0a6b82d1cff 100644 --- a/regress/sbin/pfctl/pfail10.in +++ b/regress/sbin/pfctl/pfail10.in @@ -1,5 +1,5 @@ # Test rule order processing: should fail unless scrub -> nat -> filter nat on lo0 all -> lo0 -pass in on lo1 all +pass in on lo1000000 all scrub in on lo0 all diff --git a/regress/sbin/pfctl/pfail10.ok b/regress/sbin/pfctl/pfail10.ok index 43ac1316a59..88154d7f5cf 100644 --- a/regress/sbin/pfctl/pfail10.ok +++ b/regress/sbin/pfctl/pfail10.ok @@ -1,3 +1,3 @@ stdin:4: Rules must be in order: options, normalization, queueing, translation, filtering nat on lo0 inet all -> 127.0.0.1 -pass in on lo1 all +pass in on lo1000000 all diff --git a/regress/sbin/pfctl/pfail23.in b/regress/sbin/pfctl/pfail23.in index 1895b7c0e02..8223bf1e3c6 100644 --- a/regress/sbin/pfctl/pfail23.in +++ b/regress/sbin/pfctl/pfail23.in @@ -7,5 +7,5 @@ pass in proto udp from any to any flags S/SA pass in proto { udp, icmp } from any to any flags S/SA #no routing address with matching address family found -pass out dup-to (tun0 1.1.1.1) inet6 all +pass out dup-to (tun1000000 1.1.1.1) inet6 all diff --git a/regress/sbin/pfctl/pfail30.in b/regress/sbin/pfctl/pfail30.in index c385bcf74de..6d71b4eaaf8 100644 --- a/regress/sbin/pfctl/pfail30.in +++ b/regress/sbin/pfctl/pfail30.in @@ -1,13 +1,13 @@ # invalid binat stuff -binat on lo0 from (lo0) to (lo1) -> (lo0) -binat on lo0 from (lo0) to no-route -> (lo1) +binat on lo0 from (lo0) to (lo1000000) -> (lo0) +binat on lo0 from (lo0) to no-route -> (lo1000000) binat on lo0 from no-route to any -> 1.1.1.1 binat on lo0 from !1.1.1.1 to any -> 1.1.1.1 binat on lo0 from !(lo0) to any -> 1.1.1.1 binat on lo0 from 1.1.1.1 to any -> no-route binat on lo0 from 1.1.1.1 to any -> !3.3.3.3 -binat on lo0 from 1.1.1.1 to any -> !(lo1) -#binat on { lo0 lo1 } from 1.1.1.1 to any -> 2.2.2.2 +binat on lo0 from 1.1.1.1 to any -> !(lo1000000) +#binat on { lo0 lo1000000 } from 1.1.1.1 to any -> 2.2.2.2 binat on lo0 from { 1.1.1.1 2.2.2.2 } to any -> 3.3.3.3 binat on lo0 from 1.1.1.1 to { 2.2.2.2 3.3.3.3 } -> 4.4.4.4 binat on lo0 from 1.1.1.1 to any -> { 1.1.1.1 2.2.2.2 } diff --git a/regress/sbin/pfctl/pfail32.ok b/regress/sbin/pfctl/pfail32.ok index 4bb8f5cc919..baaca715fee 100644 --- a/regress/sbin/pfctl/pfail32.ok +++ b/regress/sbin/pfctl/pfail32.ok @@ -1,5 +1,5 @@ -queue zwei already exists on interface gif3 +stdin:2: unknown interface gif3 +stdin:3: queue eins has no parent +stdin:3: errors in queue definition +stdin:4: queue zwei has no parent stdin:4: errors in queue definition -altq on gif3 cbq bandwidth 100Kb tbrsize 1280 queue { eins zwei } -queue eins cbq( default ) { zwei } -queue zwei diff --git a/regress/sbin/pfctl/pfail33.ok b/regress/sbin/pfctl/pfail33.ok index fd910e98ee8..8763aaf3d4a 100644 --- a/regress/sbin/pfctl/pfail33.ok +++ b/regress/sbin/pfctl/pfail33.ok @@ -1 +1 @@ -stdin:3: unknown cbq flag "invalid" +stdin:3: unknown interface gif2 diff --git a/regress/sbin/pfctl/pfail34.ok b/regress/sbin/pfctl/pfail34.ok index 2a9767dfc60..8763aaf3d4a 100644 --- a/regress/sbin/pfctl/pfail34.ok +++ b/regress/sbin/pfctl/pfail34.ok @@ -1 +1 @@ -stdin:3: unknown priq flag "invalid" +stdin:3: unknown interface gif2 diff --git a/regress/sbin/pfctl/pfail8.in b/regress/sbin/pfctl/pfail8.in index 469e77b5f31..da18e9509f2 100644 --- a/regress/sbin/pfctl/pfail8.in +++ b/regress/sbin/pfctl/pfail8.in @@ -1,3 +1,3 @@ -block in quick on tun0 dup-to (tun1 fec0::1) from any to 192.168.1.0/24 -block in quick on tun0 dup-to (tun1 192.168.1.1) from any to fec0::1/128 +block in quick on tun1000000 dup-to (tun1000001 fec0::1) from any to 192.168.1.0/24 +block in quick on tun1000000 dup-to (tun1000001 192.168.1.1) from any to fec0::1/128 diff --git a/regress/sbin/pfctl/pfail9.in b/regress/sbin/pfctl/pfail9.in index bb075fb53c5..6caf0ede2f2 100644 --- a/regress/sbin/pfctl/pfail9.in +++ b/regress/sbin/pfctl/pfail9.in @@ -1,6 +1,6 @@ # Test rule order processing: should fail unless scrub -> nat -> filter scrub in on lo0 all -pass in on lo1 all +pass in on lo1000000 all # bork nat on lo0 all -> lo0 diff --git a/regress/sbin/pfctl/pfail9.ok b/regress/sbin/pfctl/pfail9.ok index 08453ae4ac9..de2402b919b 100644 --- a/regress/sbin/pfctl/pfail9.ok +++ b/regress/sbin/pfctl/pfail9.ok @@ -1,3 +1,3 @@ stdin:5: Rules must be in order: options, normalization, queueing, translation, filtering scrub in on lo0 all fragment reassemble -pass in on lo1 all +pass in on lo1000000 all diff --git a/regress/sbin/pfctl/pfaltq1.in b/regress/sbin/pfctl/pfaltq1.in index 63e959e7e60..80af37e316a 100644 --- a/regress/sbin/pfctl/pfaltq1.in +++ b/regress/sbin/pfctl/pfaltq1.in @@ -1,5 +1,5 @@ #queue id assignment with priq -altq on { lo0 tun0 } tbrsize 1824 priq bandwidth 10Mb queue { one two } +altq on { lo0 tun1000000 } tbrsize 1824 priq bandwidth 10Mb queue { one two } queue one priority 1 priq(default) queue two priority 15 diff --git a/regress/sbin/pfctl/pfaltq1.ok b/regress/sbin/pfctl/pfaltq1.ok index e6a776acdba..384eb751c47 100644 --- a/regress/sbin/pfctl/pfaltq1.ok +++ b/regress/sbin/pfctl/pfaltq1.ok @@ -1,8 +1,8 @@ queue one priq( default ) [ qid=2 ifname=lo0 ifbandwidth=10Mb ] queue one priq( default ) - [ qid=2 ifname=tun0 ifbandwidth=10Mb ] + [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] queue two priority 15 [ qid=3 ifname=lo0 ifbandwidth=10Mb ] queue two priority 15 - [ qid=3 ifname=tun0 ifbandwidth=10Mb ] + [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq10.in b/regress/sbin/pfctl/pfaltq10.in index f1eeed73d98..a5e432b2977 100644 --- a/regress/sbin/pfctl/pfaltq10.in +++ b/regress/sbin/pfctl/pfaltq10.in @@ -1,7 +1,7 @@ #queue id assignment with hfsc: two same named queues on different interfaces #must have the same qid -altq on { lo0 tun0 } tbrsize 1824 hfsc bandwidth 10Mb queue { one two } +altq on { lo0 tun1000000 } tbrsize 1824 hfsc bandwidth 10Mb queue { one two } queue one bandwidth 10% hfsc(default) queue two bandwidth 90% { three four} queue three bandwidth 50% diff --git a/regress/sbin/pfctl/pfaltq10.ok b/regress/sbin/pfctl/pfaltq10.ok index 432d485866e..a85150de335 100644 --- a/regress/sbin/pfctl/pfaltq10.ok +++ b/regress/sbin/pfctl/pfaltq10.ok @@ -8,13 +8,13 @@ queue three bandwidth 4.50Mb [ qid=4 ifname=lo0 ifbandwidth=10Mb ] queue four bandwidth 3.60Mb [ qid=5 ifname=lo0 ifbandwidth=10Mb ] -queue root_tun0 bandwidth 10Mb priority 0 {one, two} - [ qid=1 ifname=tun0 ifbandwidth=10Mb ] +queue root_tun1000000 bandwidth 10Mb priority 0 {one, two} + [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ] queue one bandwidth 1Mb hfsc( default ) - [ qid=2 ifname=tun0 ifbandwidth=10Mb ] + [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] queue two bandwidth 9Mb {three, four} - [ qid=3 ifname=tun0 ifbandwidth=10Mb ] + [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ] queue three bandwidth 4.50Mb - [ qid=4 ifname=tun0 ifbandwidth=10Mb ] + [ qid=4 ifname=tun1000000 ifbandwidth=10Mb ] queue four bandwidth 3.60Mb - [ qid=5 ifname=tun0 ifbandwidth=10Mb ] + [ qid=5 ifname=tun1000000 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq11.in b/regress/sbin/pfctl/pfaltq11.in index 4ef6231a8d7..fc3de4c74da 100644 --- a/regress/sbin/pfctl/pfaltq11.in +++ b/regress/sbin/pfctl/pfaltq11.in @@ -3,7 +3,7 @@ # -two differently named queues must not share a qid, even on different ifs altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei } -altq on tun0 tbrsize 1824 bandwidth 33600b hfsc queue { vier zwei fuenf } +altq on tun1000000 tbrsize 1824 bandwidth 33600b hfsc queue { vier zwei fuenf } queue eins bandwidth 10% hfsc(default) queue zwei bandwidth 80% { sub2 sub3 } queue sub2 bandwidth 50% diff --git a/regress/sbin/pfctl/pfaltq11.ok b/regress/sbin/pfctl/pfaltq11.ok index c5179995c6f..b8a4df85686 100644 --- a/regress/sbin/pfctl/pfaltq11.ok +++ b/regress/sbin/pfctl/pfaltq11.ok @@ -12,17 +12,17 @@ queue drei bandwidth 1Mb {subseven} [ qid=6 ifname=lo0 ifbandwidth=10Mb ] queue subseven bandwidth 900Kb [ qid=9 ifname=lo0 ifbandwidth=10Mb ] -queue root_tun0 bandwidth 33.60Kb priority 0 {zwei, vier, fuenf} - [ qid=1 ifname=tun0 ifbandwidth=33.60Kb ] +queue root_tun1000000 bandwidth 33.60Kb priority 0 {zwei, vier, fuenf} + [ qid=1 ifname=tun1000000 ifbandwidth=33.60Kb ] queue zwei bandwidth 26.88Kb {sub2, sub3} - [ qid=3 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=3 ifname=tun1000000 ifbandwidth=33.60Kb ] queue sub2 bandwidth 13.40Kb - [ qid=4 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=4 ifname=tun1000000 ifbandwidth=33.60Kb ] queue sub3 bandwidth 13.40Kb - [ qid=5 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=5 ifname=tun1000000 ifbandwidth=33.60Kb ] queue vier bandwidth 3.36Kb hfsc( default ) - [ qid=7 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=7 ifname=tun1000000 ifbandwidth=33.60Kb ] queue fuenf bandwidth 16.80Kb {subseven} - [ qid=8 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=8 ifname=tun1000000 ifbandwidth=33.60Kb ] queue subseven bandwidth 15.12Kb - [ qid=9 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=9 ifname=tun1000000 ifbandwidth=33.60Kb ] diff --git a/regress/sbin/pfctl/pfaltq2.in b/regress/sbin/pfctl/pfaltq2.in index b9250d4fd17..7fa512eaac5 100644 --- a/regress/sbin/pfctl/pfaltq2.in +++ b/regress/sbin/pfctl/pfaltq2.in @@ -1,7 +1,7 @@ #queue id assignment with cbq: two same named queues on different interfaces #must have the same qid -altq on { lo0 tun0 } tbrsize 1824 cbq bandwidth 10Mb queue { one two } +altq on { lo0 tun1000000 } tbrsize 1824 cbq bandwidth 10Mb queue { one two } queue one bandwidth 10% cbq(default) queue two bandwidth 90% { three four} queue three bandwidth 50% diff --git a/regress/sbin/pfctl/pfaltq2.ok b/regress/sbin/pfctl/pfaltq2.ok index 8248fc5c229..a906cee8d41 100644 --- a/regress/sbin/pfctl/pfaltq2.ok +++ b/regress/sbin/pfctl/pfaltq2.ok @@ -8,13 +8,13 @@ queue three bandwidth 4.50Mb [ qid=3 ifname=lo0 ifbandwidth=10Mb ] queue four bandwidth 3.60Mb [ qid=4 ifname=lo0 ifbandwidth=10Mb ] -queue root_tun0 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two} - [ qid=4294967294 ifname=tun0 ifbandwidth=10Mb ] +queue root_tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two} + [ qid=4294967294 ifname=tun1000000 ifbandwidth=10Mb ] queue one bandwidth 1Mb cbq( default ) - [ qid=4294967293 ifname=tun0 ifbandwidth=10Mb ] + [ qid=4294967293 ifname=tun1000000 ifbandwidth=10Mb ] queue two bandwidth 9Mb {three, four} - [ qid=2 ifname=tun0 ifbandwidth=10Mb ] + [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] queue three bandwidth 4.50Mb - [ qid=3 ifname=tun0 ifbandwidth=10Mb ] + [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ] queue four bandwidth 3.60Mb - [ qid=4 ifname=tun0 ifbandwidth=10Mb ] + [ qid=4 ifname=tun1000000 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq3.in b/regress/sbin/pfctl/pfaltq3.in index 5ff58aff815..0a87ef0ac70 100644 --- a/regress/sbin/pfctl/pfaltq3.in +++ b/regress/sbin/pfctl/pfaltq3.in @@ -3,7 +3,7 @@ # -two differently named queues must not share a qid, even on different ifs altq on lo0 tbrsize 1824 bandwidth 10Mb cbq queue { eins zwei drei } -altq on tun0 tbrsize 1824 bandwidth 33600b cbq queue { vier zwei fuenf } +altq on tun1000000 tbrsize 1824 bandwidth 33600b cbq queue { vier zwei fuenf } queue eins bandwidth 10% cbq(default) queue zwei bandwidth 80% { sub2 sub3 } queue sub2 bandwidth 50% diff --git a/regress/sbin/pfctl/pfaltq3.ok b/regress/sbin/pfctl/pfaltq3.ok index 1b2bb21c9f0..cc951076ee4 100644 --- a/regress/sbin/pfctl/pfaltq3.ok +++ b/regress/sbin/pfctl/pfaltq3.ok @@ -12,17 +12,17 @@ queue drei bandwidth 1Mb {subseven} [ qid=5 ifname=lo0 ifbandwidth=10Mb ] queue subseven bandwidth 900Kb [ qid=7 ifname=lo0 ifbandwidth=10Mb ] -queue root_tun0 bandwidth 33.60Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf} - [ qid=4294967294 ifname=tun0 ifbandwidth=33.60Kb ] +queue root_tun1000000 bandwidth 33.60Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf} + [ qid=4294967294 ifname=tun1000000 ifbandwidth=33.60Kb ] queue zwei bandwidth 26.88Kb {sub2, sub3} - [ qid=2 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=2 ifname=tun1000000 ifbandwidth=33.60Kb ] queue sub2 bandwidth 13.40Kb - [ qid=3 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=3 ifname=tun1000000 ifbandwidth=33.60Kb ] queue sub3 bandwidth 13.40Kb - [ qid=4 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=4 ifname=tun1000000 ifbandwidth=33.60Kb ] queue vier bandwidth 16.80Kb cbq( default ) - [ qid=4294967293 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=4294967293 ifname=tun1000000 ifbandwidth=33.60Kb ] queue fuenf bandwidth 16.80Kb {subseven} - [ qid=6 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=6 ifname=tun1000000 ifbandwidth=33.60Kb ] queue subseven bandwidth 15.12Kb - [ qid=7 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=7 ifname=tun1000000 ifbandwidth=33.60Kb ] diff --git a/regress/sbin/pfctl/pfaltq4.in b/regress/sbin/pfctl/pfaltq4.in index 2bf5fb2606b..b9d3c47d411 100644 --- a/regress/sbin/pfctl/pfaltq4.in +++ b/regress/sbin/pfctl/pfaltq4.in @@ -1,7 +1,7 @@ # test two different named queues don't get the same qid on different interfaces altq on lo0 tbrsize 1824 bandwidth 10Mb cbq queue { bloody germans } -altq on tun0 tbrsize 1824 bandwidth 10Mb cbq queue { bloody toads } +altq on tun1000000 tbrsize 1824 bandwidth 10Mb cbq queue { bloody toads } queue bloody cbq(default) bandwidth 50% queue germans bandwidth 50% queue toads bandwidth 50% diff --git a/regress/sbin/pfctl/pfaltq4.ok b/regress/sbin/pfctl/pfaltq4.ok index 9a97f53a50a..6583463a340 100644 --- a/regress/sbin/pfctl/pfaltq4.ok +++ b/regress/sbin/pfctl/pfaltq4.ok @@ -4,9 +4,9 @@ queue bloody bandwidth 5Mb cbq( default ) [ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ] queue germans bandwidth 5Mb [ qid=2 ifname=lo0 ifbandwidth=10Mb ] -queue root_tun0 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, toads} - [ qid=4294967294 ifname=tun0 ifbandwidth=10Mb ] +queue root_tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, toads} + [ qid=4294967294 ifname=tun1000000 ifbandwidth=10Mb ] queue bloody bandwidth 5Mb cbq( default ) - [ qid=4294967293 ifname=tun0 ifbandwidth=10Mb ] + [ qid=4294967293 ifname=tun1000000 ifbandwidth=10Mb ] queue toads bandwidth 5Mb - [ qid=3 ifname=tun0 ifbandwidth=10Mb ] + [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq7.in b/regress/sbin/pfctl/pfaltq7.in index 9678a7e1653..4cc69ac0356 100644 --- a/regress/sbin/pfctl/pfaltq7.in +++ b/regress/sbin/pfctl/pfaltq7.in @@ -6,7 +6,7 @@ altq on lo0 tbrsize 1824 bandwidth 10Mb priq queue eins queue eins priority 2 priq(default) -altq on tun0 tbrsize 1824 bandwidth 33600b priq queue zwei +altq on tun1000000 tbrsize 1824 bandwidth 33600b priq queue zwei queue zwei priority 2 priq(default) diff --git a/regress/sbin/pfctl/pfaltq7.ok b/regress/sbin/pfctl/pfaltq7.ok index 2c2d016cb03..fe250e95966 100644 --- a/regress/sbin/pfctl/pfaltq7.ok +++ b/regress/sbin/pfctl/pfaltq7.ok @@ -1,4 +1,4 @@ queue eins priority 2 priq( default ) [ qid=2 ifname=lo0 ifbandwidth=10Mb ] queue zwei priority 2 priq( default ) - [ qid=3 ifname=tun0 ifbandwidth=33.60Kb ] + [ qid=3 ifname=tun1000000 ifbandwidth=33.60Kb ] diff --git a/regress/sbin/pfctl/pfaltq8.in b/regress/sbin/pfctl/pfaltq8.in index 1ca83b0f161..483d2174425 100644 --- a/regress/sbin/pfctl/pfaltq8.in +++ b/regress/sbin/pfctl/pfaltq8.in @@ -1,7 +1,7 @@ # queuespec limited to interface(s) -altq on { ppp0 ppp1 tun0 tun1 } priq bandwidth 10Mb queue { one two } +altq on { ppp0 ppp1 tun1000000 tun1000001 } priq bandwidth 10Mb queue { one two } queue one priority 1 priq(default) queue two on ppp0 priority 15 -queue two on { ppp1 tun0 tun1 } priority 0 +queue two on { ppp1 tun1000000 tun1000001 } priority 0 diff --git a/regress/sbin/pfctl/pfaltq8.ok b/regress/sbin/pfctl/pfaltq8.ok index 77c42d68c9a..d1159fa3323 100644 --- a/regress/sbin/pfctl/pfaltq8.ok +++ b/regress/sbin/pfctl/pfaltq8.ok @@ -3,14 +3,14 @@ queue one priq( default ) queue one priq( default ) [ qid=2 ifname=ppp1 ifbandwidth=10Mb ] queue one priq( default ) - [ qid=2 ifname=tun0 ifbandwidth=10Mb ] + [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] queue one priq( default ) - [ qid=2 ifname=tun1 ifbandwidth=10Mb ] + [ qid=2 ifname=tun1000001 ifbandwidth=10Mb ] queue two priority 15 [ qid=3 ifname=ppp0 ifbandwidth=10Mb ] queue two priority 0 [ qid=3 ifname=ppp1 ifbandwidth=10Mb ] queue two priority 0 - [ qid=3 ifname=tun0 ifbandwidth=10Mb ] + [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ] queue two priority 0 - [ qid=3 ifname=tun1 ifbandwidth=10Mb ] + [ qid=3 ifname=tun1000001 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq9.in b/regress/sbin/pfctl/pfaltq9.in index 97128b09d07..fdf857d61b5 100644 --- a/regress/sbin/pfctl/pfaltq9.in +++ b/regress/sbin/pfctl/pfaltq9.in @@ -1,6 +1,6 @@ # queuespec limited to interface(s): negation -altq on { ppp0 ppp1 tun0 tun1 } priq bandwidth 10Mb queue { one two } +altq on { ppp0 ppp1 tun1000000 tun1000001 } priq bandwidth 10Mb queue { one two } queue one priority 1 priq(default) queue two on ppp0 priority 15 queue two on ! ppp0 priority 0 diff --git a/regress/sbin/pfctl/pfaltq9.ok b/regress/sbin/pfctl/pfaltq9.ok index 77c42d68c9a..d1159fa3323 100644 --- a/regress/sbin/pfctl/pfaltq9.ok +++ b/regress/sbin/pfctl/pfaltq9.ok @@ -3,14 +3,14 @@ queue one priq( default ) queue one priq( default ) [ qid=2 ifname=ppp1 ifbandwidth=10Mb ] queue one priq( default ) - [ qid=2 ifname=tun0 ifbandwidth=10Mb ] + [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] queue one priq( default ) - [ qid=2 ifname=tun1 ifbandwidth=10Mb ] + [ qid=2 ifname=tun1000001 ifbandwidth=10Mb ] queue two priority 15 [ qid=3 ifname=ppp0 ifbandwidth=10Mb ] queue two priority 0 [ qid=3 ifname=ppp1 ifbandwidth=10Mb ] queue two priority 0 - [ qid=3 ifname=tun0 ifbandwidth=10Mb ] + [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ] queue two priority 0 - [ qid=3 ifname=tun1 ifbandwidth=10Mb ] + [ qid=3 ifname=tun1000001 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfsetup1.clean b/regress/sbin/pfctl/pfsetup1.clean index 561f7c6ee89..da10135a5a3 100644 --- a/regress/sbin/pfctl/pfsetup1.clean +++ b/regress/sbin/pfctl/pfsetup1.clean @@ -1 +1,2 @@ -ifconfig lo1 inet 192.168.0.1 netmask 0xffffff00 delete -link1 +ifconfig lo1000010 inet 192.168.0.1 netmask 0xffffff00 delete -link1 +ifconfig lo1000010 destroy diff --git a/regress/sbin/pfctl/pfsetup1.in b/regress/sbin/pfctl/pfsetup1.in index 4628fca7853..70422516715 100644 --- a/regress/sbin/pfctl/pfsetup1.in +++ b/regress/sbin/pfctl/pfsetup1.in @@ -1 +1 @@ -pass in from any to lo1 +pass in from any to lo1000010 diff --git a/regress/sbin/pfctl/pfsetup1.setup b/regress/sbin/pfctl/pfsetup1.setup index 8dd2dae4099..34d0b200f09 100644 --- a/regress/sbin/pfctl/pfsetup1.setup +++ b/regress/sbin/pfctl/pfsetup1.setup @@ -1 +1,2 @@ -ifconfig lo1 inet 192.168.0.1 netmask 0xffffff00 link1 +ifconfig lo1000010 create +ifconfig lo1000010 inet 192.168.0.1 netmask 0xffffff00 link1 diff --git a/regress/sbin/pfctl/pfsetup2.clean b/regress/sbin/pfctl/pfsetup2.clean index 895639a56d4..b6fd84de27a 100644 --- a/regress/sbin/pfctl/pfsetup2.clean +++ b/regress/sbin/pfctl/pfsetup2.clean @@ -1,2 +1,2 @@ -ifconfig lo1 mtu 33224 +ifconfig lo1000010 destroy diff --git a/regress/sbin/pfctl/pfsetup2.in b/regress/sbin/pfctl/pfsetup2.in index 37c08116929..c5da6b8f7bf 100644 --- a/regress/sbin/pfctl/pfsetup2.in +++ b/regress/sbin/pfctl/pfsetup2.in @@ -1,4 +1,4 @@ #test tbrsize calculation -altq on lo1 bandwidth 10Mb cbq queue { openbsd rocks } +altq on lo1000010 bandwidth 10Mb cbq queue { openbsd rocks } queue openbsd cbq(default) diff --git a/regress/sbin/pfctl/pfsetup2.ok b/regress/sbin/pfctl/pfsetup2.ok index 90333b02fbd..8884febb40d 100644 --- a/regress/sbin/pfctl/pfsetup2.ok +++ b/regress/sbin/pfctl/pfsetup2.ok @@ -1,2 +1,2 @@ -altq on lo1 cbq bandwidth 10Mb tbrsize 6000 queue { openbsd rocks } +altq on lo1000010 cbq bandwidth 10Mb tbrsize 6000 queue { openbsd rocks } queue openbsd cbq( default ) diff --git a/regress/sbin/pfctl/pfsetup2.setup b/regress/sbin/pfctl/pfsetup2.setup index 59defee90c7..58969b7252c 100644 --- a/regress/sbin/pfctl/pfsetup2.setup +++ b/regress/sbin/pfctl/pfsetup2.setup @@ -1 +1,2 @@ -ifconfig lo1 mtu 1500 +ifconfig lo1000010 create +ifconfig lo1000010 mtu 1500 diff --git a/regress/sbin/pfctl/pfsetup3.clean b/regress/sbin/pfctl/pfsetup3.clean index 7b9fbc6792b..fe86a9e89c0 100644 --- a/regress/sbin/pfctl/pfsetup3.clean +++ b/regress/sbin/pfctl/pfsetup3.clean @@ -1 +1 @@ -ifconfig lo1 mtu 33224 +ifconfig lo1000010 destroy diff --git a/regress/sbin/pfctl/pfsetup3.in b/regress/sbin/pfctl/pfsetup3.in index 37c08116929..c5da6b8f7bf 100644 --- a/regress/sbin/pfctl/pfsetup3.in +++ b/regress/sbin/pfctl/pfsetup3.in @@ -1,4 +1,4 @@ #test tbrsize calculation -altq on lo1 bandwidth 10Mb cbq queue { openbsd rocks } +altq on lo1000010 bandwidth 10Mb cbq queue { openbsd rocks } queue openbsd cbq(default) diff --git a/regress/sbin/pfctl/pfsetup3.ok b/regress/sbin/pfctl/pfsetup3.ok index 82ed7fbeeab..984ba0d8f6f 100644 --- a/regress/sbin/pfctl/pfsetup3.ok +++ b/regress/sbin/pfctl/pfsetup3.ok @@ -1,2 +1,2 @@ -altq on lo1 cbq bandwidth 10Mb tbrsize 32000 queue { openbsd rocks } +altq on lo1000010 cbq bandwidth 10Mb tbrsize 32000 queue { openbsd rocks } queue openbsd cbq( default ) diff --git a/regress/sbin/pfctl/pfsetup3.setup b/regress/sbin/pfctl/pfsetup3.setup index a6660366e82..8257550e3aa 100644 --- a/regress/sbin/pfctl/pfsetup3.setup +++ b/regress/sbin/pfctl/pfsetup3.setup @@ -1 +1,2 @@ -ifconfig lo1 mtu 8000 +ifconfig lo1000010 create +ifconfig lo1000010 mtu 8000
\ No newline at end of file diff --git a/regress/sbin/pfctl/pfsetup4.clean b/regress/sbin/pfctl/pfsetup4.clean index 4f3daea01e2..db14d1de1f8 100644 --- a/regress/sbin/pfctl/pfsetup4.clean +++ b/regress/sbin/pfctl/pfsetup4.clean @@ -1 +1 @@ -ifconfig lo1 inet 192.168.0.1 netmask 0xffffff00 delete +ifconfig lo1000000 inet 192.168.0.1 netmask 0xffffff00 delete diff --git a/regress/sbin/pfctl/pfsetup4.in b/regress/sbin/pfctl/pfsetup4.in index 474a75f2022..fcb706e836e 100644 --- a/regress/sbin/pfctl/pfsetup4.in +++ b/regress/sbin/pfctl/pfsetup4.in @@ -1,2 +1,2 @@ -antispoof log quick for { lo0 lo1 } inet \ +antispoof log quick for { lo0 lo1000000 } inet \ label "antispoof:$if:$srcaddr:$dstaddr" diff --git a/regress/sbin/pfctl/pfsetup4.ok b/regress/sbin/pfctl/pfsetup4.ok index 73394b38498..b2a0e0eb624 100644 --- a/regress/sbin/pfctl/pfsetup4.ok +++ b/regress/sbin/pfctl/pfsetup4.ok @@ -1,2 +1,2 @@ block drop in log quick on ! lo0 inet from 127.0.0.0/8 to any label "antispoof:lo0:127.0.0.0/8:any" -block drop in log quick on ! lo1 inet from 192.168.0.0/24 to any label "antispoof:lo1:192.168.0.0/24:any" +block drop in log quick on ! lo1000000 inet from 192.168.0.0/24 to any label "antispoof:lo1000000:192.168.0.0/24:any" diff --git a/regress/sbin/pfctl/pfsetup4.setup b/regress/sbin/pfctl/pfsetup4.setup index ef2f8f25de4..96a10817769 100644 --- a/regress/sbin/pfctl/pfsetup4.setup +++ b/regress/sbin/pfctl/pfsetup4.setup @@ -1 +1 @@ -ifconfig lo1 inet 192.168.0.1 netmask 0xffffff00 +ifconfig lo1000000 inet 192.168.0.1 netmask 0xffffff00 |