diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2011-11-27 10:33:38 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2011-11-27 10:33:38 +0000 |
| commit | 4a9316751eb56db36bcd529a139b6b535ccaf05d (patch) | |
| tree | 66781d093e661e0df367c68a172eccdb706829a0 /regress | |
| parent | 968b16735d3583527e6669e6fe510e5413c52b99 (diff) | |
adjust for port numbers instead of names by default
From: Lawrence Teo <lteo at devio at us>
Diffstat (limited to 'regress')
66 files changed, 413 insertions, 413 deletions
diff --git a/regress/sbin/pfctl/pf1.loaded b/regress/sbin/pfctl/pf1.loaded index ee65a3de3b8..8928dc6f588 100644 --- a/regress/sbin/pfctl/pf1.loaded +++ b/regress/sbin/pfctl/pf1.loaded @@ -10,11 +10,11 @@ [ Skip steps: i=end r=end d=end f=4 p=5 sa=4 da=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in proto tcp from any to any port = smtp flags S/SA +@3 pass in proto tcp from any to any port = 25 flags S/SA [ Skip steps: i=end r=end d=end p=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh flags S/SA +@4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != 22 flags S/SA [ Skip steps: i=end r=end d=end f=end sa=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf1.ok b/regress/sbin/pfctl/pf1.ok index b8ced2dd03b..b8f91e8f784 100644 --- a/regress/sbin/pfctl/pf1.ok +++ b/regress/sbin/pfctl/pf1.ok @@ -1,8 +1,8 @@ pass in all flags S/SA pass in all no state pass in proto tcp from any port <= 1024 to any flags S/SA label "foo_bar" -pass in proto tcp from any to any port = smtp flags S/SA -pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh flags S/SA +pass in proto tcp from any to any port = 25 flags S/SA +pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != 22 flags S/SA pass in inet proto igmp from 10.0.0.0/8 to 10.1.1.1 allow-opts pass in inet proto tcp from 1.2.3.4 to any flags S/SA label "6:tcp:1.2.3.4::any:" pass in inet proto tcp from 1.2.3.5 to any flags S/SA label "7:tcp:1.2.3.5::any:" diff --git a/regress/sbin/pfctl/pf1.optimized b/regress/sbin/pfctl/pf1.optimized index ee65a3de3b8..8928dc6f588 100644 --- a/regress/sbin/pfctl/pf1.optimized +++ b/regress/sbin/pfctl/pf1.optimized @@ -10,11 +10,11 @@ [ Skip steps: i=end r=end d=end f=4 p=5 sa=4 da=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in proto tcp from any to any port = smtp flags S/SA +@3 pass in proto tcp from any to any port = 25 flags S/SA [ Skip steps: i=end r=end d=end p=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh flags S/SA +@4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != 22 flags S/SA [ Skip steps: i=end r=end d=end f=end sa=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf101.loaded b/regress/sbin/pfctl/pf101.loaded index 67f7c9b86c9..c196b2202d2 100644 --- a/regress/sbin/pfctl/pf101.loaded +++ b/regress/sbin/pfctl/pf101.loaded @@ -2,15 +2,15 @@ [ Skip steps: d=end f=2 sa=end da=2 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out on lo1000000 proto tcp from any to any port = ssh flags S/SA prio(5, 2) +@1 pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA prio(5, 2) [ Skip steps: d=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass inet proto udp from any to 127.0.0.1 port = domain prio 4 +@2 pass inet proto udp from any to 127.0.0.1 port = 53 prio 4 [ Skip steps: i=end r=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 ] -@3 pass inet proto udp from any to 127.0.0.2 port = domain prio 4 +@3 pass inet proto udp from any to 127.0.0.2 port = 53 prio 4 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf101.ok b/regress/sbin/pfctl/pf101.ok index fcfdb6c9d80..df7bc25eac4 100644 --- a/regress/sbin/pfctl/pf101.ok +++ b/regress/sbin/pfctl/pf101.ok @@ -1,4 +1,4 @@ pass all flags S/SA prio 3 -pass out on lo1000000 proto tcp from any to any port = ssh flags S/SA prio(5, 2) -pass inet proto udp from any to 127.0.0.1 port = domain prio 4 -pass inet proto udp from any to 127.0.0.2 port = domain prio 4 +pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA prio(5, 2) +pass inet proto udp from any to 127.0.0.1 port = 53 prio 4 +pass inet proto udp from any to 127.0.0.2 port = 53 prio 4 diff --git a/regress/sbin/pfctl/pf13.loaded b/regress/sbin/pfctl/pf13.loaded index 433cae5e75e..a6ddabe56cf 100644 --- a/regress/sbin/pfctl/pf13.loaded +++ b/regress/sbin/pfctl/pf13.loaded @@ -22,11 +22,11 @@ [ Skip steps: i=end d=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 tun1000000 inet proto tcp from any to any port = ftp dup-to 192.168.1.1@tun1000001 +@6 block drop in on tun1000000 inet proto tcp from any to any port = 21 dup-to 192.168.1.1@tun1000001 [ Skip steps: i=end r=end d=end p=8 sa=8 da=8 sp=end dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 block drop in on tun1000000 inet6 proto tcp from any to any port = ftp dup-to fec0::1@tun1000001 +@7 block drop in on tun1000000 inet6 proto tcp from any to any port = 21 dup-to fec0::1@tun1000001 [ Skip steps: i=end r=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -38,11 +38,11 @@ [ Skip steps: i=end r=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 tun1000000 inet proto tcp from any to any port = ftp reply-to 192.168.1.1@tun1000001 +@10 block drop in on tun1000000 inet proto tcp from any to any port = 21 reply-to 192.168.1.1@tun1000001 [ Skip steps: i=end r=end d=end p=12 sa=12 da=12 sp=end dp=12 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 block drop in on tun1000000 inet6 proto tcp from any to any port = ftp reply-to fec0::1@tun1000001 +@11 block drop in on tun1000000 inet6 proto tcp from any to any port = 21 reply-to fec0::1@tun1000001 [ Skip steps: i=end r=end d=end sp=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 98a7dbfb17d..00a689ce088 100644 --- a/regress/sbin/pfctl/pf13.ok +++ b/regress/sbin/pfctl/pf13.ok @@ -4,12 +4,12 @@ pass in quick on enc0 inet6 all flags S/SA pass out quick on tun1000000 inet all flags S/SA route-to tun1000001 pass out quick on tun1000000 inet from any to 192.168.1.1 flags S/SA route-to tun1000001 pass out quick on tun1000000 inet6 from any to fec0::1 flags S/SA route-to tun1000001 -block drop in on tun1000000 inet proto tcp from any to any port = ftp dup-to 192.168.1.1@tun1000001 -block drop in on tun1000000 inet6 proto tcp from any to any port = ftp dup-to fec0::1@tun1000001 +block drop in on tun1000000 inet proto tcp from any to any port = 21 dup-to 192.168.1.1@tun1000001 +block drop in on tun1000000 inet6 proto tcp from any to any port = 21 dup-to fec0::1@tun1000001 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA route-to tun1000001 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA route-to tun1000001 -block drop in on tun1000000 inet proto tcp from any to any port = ftp reply-to 192.168.1.1@tun1000001 -block drop in on tun1000000 inet6 proto tcp from any to any port = ftp reply-to fec0::1@tun1000001 +block drop in on tun1000000 inet proto tcp from any to any port = 21 reply-to 192.168.1.1@tun1000001 +block drop in on tun1000000 inet6 proto tcp from any to any port = 21 reply-to fec0::1@tun1000001 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA reply-to tun1000001 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA reply-to tun1000001 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA dup-to 192.168.1.100@tun1000001 diff --git a/regress/sbin/pfctl/pf13.optimized b/regress/sbin/pfctl/pf13.optimized index 539493fccf4..6a19e34921d 100644 --- a/regress/sbin/pfctl/pf13.optimized +++ b/regress/sbin/pfctl/pf13.optimized @@ -10,11 +10,11 @@ [ Skip steps: i=end d=end sa=5 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 block drop in on tun1000000 inet proto tcp from any to any port = ftp dup-to 192.168.1.1@tun1000001 +@3 block drop in on tun1000000 inet proto tcp from any to any port = 21 dup-to 192.168.1.1@tun1000001 [ Skip steps: i=end r=end d=end p=5 sa=5 da=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 block drop in on tun1000000 inet6 proto tcp from any to any port = ftp dup-to fec0::1@tun1000001 +@4 block drop in on tun1000000 inet6 proto tcp from any to any port = 21 dup-to fec0::1@tun1000001 [ Skip steps: i=end r=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -26,11 +26,11 @@ [ Skip steps: i=end r=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 block drop in on tun1000000 inet proto tcp from any to any port = ftp reply-to 192.168.1.1@tun1000001 +@7 block drop in on tun1000000 inet proto tcp from any to any port = 21 reply-to 192.168.1.1@tun1000001 [ Skip steps: i=end r=end d=end p=9 sa=9 da=9 sp=end dp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 block drop in on tun1000000 inet6 proto tcp from any to any port = ftp reply-to fec0::1@tun1000001 +@8 block drop in on tun1000000 inet6 proto tcp from any to any port = 21 reply-to fec0::1@tun1000001 [ Skip steps: i=end r=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf19.loaded b/regress/sbin/pfctl/pf19.loaded index 45dacd3672f..aaae9869f55 100644 --- a/regress/sbin/pfctl/pf19.loaded +++ b/regress/sbin/pfctl/pf19.loaded @@ -2,35 +2,35 @@ [ Skip steps: i=5 r=end d=end f=end p=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@1 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=5 r=end d=end f=end p=end sa=3 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@2 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=5 r=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 ] -@3 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@3 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=5 r=end d=end f=end p=end sa=5 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@4 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: r=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 ] -@5 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@5 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=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 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@6 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=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 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@7 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=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 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@8 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf19.ok b/regress/sbin/pfctl/pf19.ok index a5afc374d19..c2216343f46 100644 --- a/regress/sbin/pfctl/pf19.ok +++ b/regress/sbin/pfctl/pf19.ok @@ -3,11 +3,11 @@ 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 }" match in on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 rdr-to 10.0.0.10 port 22 -match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 diff --git a/regress/sbin/pfctl/pf19.optimized b/regress/sbin/pfctl/pf19.optimized index 45dacd3672f..aaae9869f55 100644 --- a/regress/sbin/pfctl/pf19.optimized +++ b/regress/sbin/pfctl/pf19.optimized @@ -2,35 +2,35 @@ [ Skip steps: i=5 r=end d=end f=end p=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@1 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=5 r=end d=end f=end p=end sa=3 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@2 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=5 r=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 ] -@3 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@3 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=5 r=end d=end f=end p=end sa=5 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@4 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: r=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 ] -@5 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@5 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=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 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@6 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=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 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@7 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=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 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@8 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf2.loaded b/regress/sbin/pfctl/pf2.loaded index 0f53321d398..6e0cfd3eee5 100644 --- a/regress/sbin/pfctl/pf2.loaded +++ b/regress/sbin/pfctl/pf2.loaded @@ -62,7 +62,7 @@ [ Skip steps: i=end d=end f=end p=17 sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass in on tun1000000 proto udp from any to any port = domain +@16 pass in on tun1000000 proto udp from any to any port = 53 [ Skip steps: i=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -70,19 +70,19 @@ [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA +@18 pass in on tun1000000 proto tcp from any to any port = 22 flags S/SA [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA +@19 pass in on tun1000000 proto tcp from any to any port = 25 flags S/SA [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass in on tun1000000 proto tcp from any to any port = domain flags S/SA +@20 pass in on tun1000000 proto tcp from any to any port = 53 flags S/SA [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass in on tun1000000 proto tcp from any to any port = auth flags S/SA +@21 pass in on tun1000000 proto tcp from any to any port = 113 flags S/SA [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf2.ok b/regress/sbin/pfctl/pf2.ok index 66f2b1d34c1..055bde1695e 100644 --- a/regress/sbin/pfctl/pf2.ok +++ b/regress/sbin/pfctl/pf2.ok @@ -14,9 +14,9 @@ block drop in log quick from no-route to any pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 pass out on tun1000000 proto udp all -pass in on tun1000000 proto udp from any to any port = domain +pass in on tun1000000 proto udp from any to any port = 53 pass out on tun1000000 proto tcp all flags S/SA -pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA -pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA -pass in on tun1000000 proto tcp from any to any port = domain flags S/SA -pass in on tun1000000 proto tcp from any to any port = auth flags S/SA +pass in on tun1000000 proto tcp from any to any port = 22 flags S/SA +pass in on tun1000000 proto tcp from any to any port = 25 flags S/SA +pass in on tun1000000 proto tcp from any to any port = 53 flags S/SA +pass in on tun1000000 proto tcp from any to any port = 113 flags S/SA diff --git a/regress/sbin/pfctl/pf2.optimized b/regress/sbin/pfctl/pf2.optimized index d60889f3e0b..2a1121be7bb 100644 --- a/regress/sbin/pfctl/pf2.optimized +++ b/regress/sbin/pfctl/pf2.optimized @@ -50,19 +50,19 @@ [ Skip steps: r=19 d=end f=17 da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA +@13 pass in on tun1000000 proto tcp from any to any port = 22 flags S/SA [ Skip steps: i=end r=19 d=end f=17 p=17 sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA +@14 pass in on tun1000000 proto tcp from any to any port = 25 flags S/SA [ Skip steps: i=end r=19 d=end f=17 p=17 sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in on tun1000000 proto tcp from any to any port = domain flags S/SA +@15 pass in on tun1000000 proto tcp from any to any port = 53 flags S/SA [ Skip steps: i=end r=19 d=end f=17 p=17 sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass in on tun1000000 proto tcp from any to any port = auth flags S/SA +@16 pass in on tun1000000 proto tcp from any to any port = 113 flags S/SA [ Skip steps: i=end r=19 d=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -70,7 +70,7 @@ [ Skip steps: i=end r=19 d=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass in on tun1000000 proto udp from any to any port = domain +@18 pass in on tun1000000 proto udp from any to any port = 53 [ Skip steps: i=end d=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf20.loaded b/regress/sbin/pfctl/pf20.loaded index b073d2c3ae6..33a0c54b9e8 100644 --- a/regress/sbin/pfctl/pf20.loaded +++ b/regress/sbin/pfctl/pf20.loaded @@ -14,35 +14,35 @@ [ Skip steps: i=8 d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@4 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=8 r=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 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@5 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=8 r=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 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@6 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=8 r=end d=end f=end p=end sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@7 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: r=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 ] -@8 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@8 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=end d=end f=end p=end sa=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@9 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=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 ] -@10 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@10 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=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 ] -@11 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@11 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf20.ok b/regress/sbin/pfctl/pf20.ok index bd2c6cf2055..0d19e608323 100644 --- a/regress/sbin/pfctl/pf20.ok +++ b/regress/sbin/pfctl/pf20.ok @@ -6,11 +6,11 @@ match out on lo0 inet from 127.0.0.0/24 to 1.2.3.0/25 nat-to 127.0.0.1 match out on lo0 inet from 127.0.0.0/24 to 2.4.6.8/30 nat-to 127.0.0.1 match out on lo0 inet from 10.0.1.0/24 to 1.2.3.0/25 nat-to 127.0.0.1 match out on lo0 inet from 10.0.1.0/24 to 2.4.6.8/30 nat-to 127.0.0.1 -match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 -match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 +match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 diff --git a/regress/sbin/pfctl/pf20.optimized b/regress/sbin/pfctl/pf20.optimized index b073d2c3ae6..33a0c54b9e8 100644 --- a/regress/sbin/pfctl/pf20.optimized +++ b/regress/sbin/pfctl/pf20.optimized @@ -14,35 +14,35 @@ [ Skip steps: i=8 d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@4 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=8 r=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 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@5 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=8 r=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 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@6 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=8 r=end d=end f=end p=end sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@7 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: r=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 ] -@8 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@8 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=end d=end f=end p=end sa=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@9 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=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 ] -@10 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 +@10 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=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 ] -@11 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 +@11 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf24.loaded b/regress/sbin/pfctl/pf24.loaded index f032f59eac4..3f1d9dc414c 100644 --- a/regress/sbin/pfctl/pf24.loaded +++ b/regress/sbin/pfctl/pf24.loaded @@ -1,8 +1,8 @@ -@0 pass in proto tcp from any to any port = ssh flags S/SA +@0 pass in proto tcp from any to any port = 22 flags S/SA [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in proto tcp from any to any port = ftp flags S/SA +@1 pass in proto tcp from any to any port = 21 flags S/SA [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf24.ok b/regress/sbin/pfctl/pf24.ok index 01f21d476f8..98f7bc67f47 100644 --- a/regress/sbin/pfctl/pf24.ok +++ b/regress/sbin/pfctl/pf24.ok @@ -3,5 +3,5 @@ b = "ftp" c = "ssh ftp" d = "ssh ftp ssh ftp" e = "ssh ftp ftp test ssh ftp" -pass in proto tcp from any to any port = ssh flags S/SA -pass in proto tcp from any to any port = ftp flags S/SA +pass in proto tcp from any to any port = 22 flags S/SA +pass in proto tcp from any to any port = 21 flags S/SA diff --git a/regress/sbin/pfctl/pf24.optimized b/regress/sbin/pfctl/pf24.optimized index f032f59eac4..3f1d9dc414c 100644 --- a/regress/sbin/pfctl/pf24.optimized +++ b/regress/sbin/pfctl/pf24.optimized @@ -1,8 +1,8 @@ -@0 pass in proto tcp from any to any port = ssh flags S/SA +@0 pass in proto tcp from any to any port = 22 flags S/SA [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in proto tcp from any to any port = ftp flags S/SA +@1 pass in proto tcp from any to any port = 21 flags S/SA [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf33.loaded b/regress/sbin/pfctl/pf33.loaded index b46e8ba7164..ed76d509266 100644 --- a/regress/sbin/pfctl/pf33.loaded +++ b/regress/sbin/pfctl/pf33.loaded @@ -2,19 +2,19 @@ [ Skip steps: i=end d=2 f=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo0 inet proto tcp from any to any port = www keep state queue http +@1 pass in on lo0 inet proto tcp from any to any port = 80 keep state queue http [ Skip steps: i=end f=end p=5 sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass out on lo0 inet proto tcp from any to any port = ssh keep state queue ssh +@2 pass out on lo0 inet proto tcp from any to any port = 22 keep state queue ssh [ Skip steps: i=end f=end p=5 sa=end sp=end da=end dp=4 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on lo0 inet proto tcp from any to any port = ssh keep state queue ssh +@3 pass in on lo0 inet proto tcp from any to any port = 22 keep state queue ssh [ Skip steps: i=end f=end p=5 sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out on lo0 inet proto tcp from any to any port = smtp keep state queue mail +@4 pass out on lo0 inet proto tcp from any to any port = 25 keep state queue mail [ Skip steps: i=end d=end f=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf33.ok b/regress/sbin/pfctl/pf33.ok index 86e703e27ee..e98a3a1c210 100644 --- a/regress/sbin/pfctl/pf33.ok +++ b/regress/sbin/pfctl/pf33.ok @@ -8,8 +8,8 @@ queue mail bandwidth 10% queue ssh bandwidth 200Kb priority 7 cbq( borrow ) queue rsets bandwidth 150Kb priority 0 cbq( red ) block return in on lo0 inet all queue rsets -pass in on lo0 inet proto tcp from any to any port = www flags S/SA queue http -pass out on lo0 inet proto tcp from any to any port = ssh flags S/SA queue ssh -pass in on lo0 inet proto tcp from any to any port = ssh flags S/SA queue ssh -pass out on lo0 inet proto tcp from any to any port = smtp flags S/SA queue mail +pass in on lo0 inet proto tcp from any to any port = 80 flags S/SA queue http +pass out on lo0 inet proto tcp from any to any port = 22 flags S/SA queue ssh +pass in on lo0 inet proto tcp from any to any port = 22 flags S/SA queue ssh +pass out on lo0 inet proto tcp from any to any port = 25 flags S/SA queue mail pass out on lo0 inet all flags S/SA diff --git a/regress/sbin/pfctl/pf35.loaded b/regress/sbin/pfctl/pf35.loaded index ad524701b86..be5206d0a7e 100644 --- a/regress/sbin/pfctl/pf35.loaded +++ b/regress/sbin/pfctl/pf35.loaded @@ -2,23 +2,23 @@ [ Skip steps: i=end d=end f=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = www keep state queue developers +@1 pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = 80 keep state queue developers [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=3 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = www keep state queue employees +@2 pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = 80 keep state queue employees [ Skip steps: i=end d=end f=end p=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass out on lo0 inet proto tcp from any to any port = ssh tos 0x10 keep state queue ssh_interactive +@3 pass out on lo0 inet proto tcp from any to any port = 22 tos 0x10 keep state queue ssh_interactive [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=5 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out on lo0 inet proto tcp from any to any port = ssh tos 0x08 keep state queue ssh_bulk +@4 pass out on lo0 inet proto tcp from any to any port = 22 tos 0x08 keep state queue ssh_bulk [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass out on lo0 inet proto tcp from any to any port = smtp keep state queue mail +@5 pass out on lo0 inet proto tcp from any to any port = 25 keep state queue mail [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf35.ok b/regress/sbin/pfctl/pf35.ok index de66819e304..ee56bc16bdc 100644 --- a/regress/sbin/pfctl/pf35.ok +++ b/regress/sbin/pfctl/pf35.ok @@ -11,8 +11,8 @@ queue ssh bandwidth 20% cbq( borrow ) { ssh_interactive ssh_bulk } queue ssh_interactive bandwidth 30% priority 7 queue ssh_bulk bandwidth 70% priority 0 qlimit 60 block return out on lo0 inet all queue std -pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = www flags S/SA queue developers -pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = www flags S/SA queue employees -pass out on lo0 inet proto tcp from any to any port = ssh flags S/SA tos 0x10 queue ssh_interactive -pass out on lo0 inet proto tcp from any to any port = ssh flags S/SA tos 0x08 queue ssh_bulk -pass out on lo0 inet proto tcp from any to any port = smtp flags S/SA queue mail +pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = 80 flags S/SA queue developers +pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = 80 flags S/SA queue employees +pass out on lo0 inet proto tcp from any to any port = 22 flags S/SA tos 0x10 queue ssh_interactive +pass out on lo0 inet proto tcp from any to any port = 22 flags S/SA tos 0x08 queue ssh_bulk +pass out on lo0 inet proto tcp from any to any port = 25 flags S/SA queue mail diff --git a/regress/sbin/pfctl/pf4.loaded b/regress/sbin/pfctl/pf4.loaded index 196b31234c2..ca0dcfeaf7c 100644 --- a/regress/sbin/pfctl/pf4.loaded +++ b/regress/sbin/pfctl/pf4.loaded @@ -34,11 +34,11 @@ [ Skip steps: i=end r=end d=end da=14 dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 block drop in proto tcp from any port = ssh to any +@9 block drop in proto tcp from any port = 22 to any [ Skip steps: i=end r=end d=end f=14 p=38 sa=14 da=14 sp=11 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 block drop in proto tcp from any port = ssh to any port 1024:2048 +@10 block drop in proto tcp from any port = 22 to any port 1024:2048 [ Skip steps: i=end r=end d=end f=14 p=38 sa=14 da=14 dp=14 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -54,111 +54,111 @@ [ Skip steps: i=end r=end d=end p=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 +@14 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6667 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=17 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 +@15 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6668 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=17 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535 +@16 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667 +@17 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=20 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 +@18 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=20 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port 6669:65535 +@19 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 +@20 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6667 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=23 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 +@21 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6668 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=23 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@22 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 +@22 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 12.34.56.78 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@23 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667 +@23 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@24 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668 +@24 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668 [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@25 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port 6669:65535 +@25 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 12.34.56.78 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@26 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 +@26 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6667 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=29 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@27 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 +@27 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6668 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=29 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@28 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535 +@28 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@29 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667 +@29 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@30 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 +@30 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@31 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port 6669:65535 +@31 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@32 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 +@32 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6667 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@33 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 +@33 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6668 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@34 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 +@34 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 12.34.56.78 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@35 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667 +@35 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@36 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668 +@36 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668 [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@37 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port 6669:65535 +@37 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 12.34.56.78 port 6669:65535 [ Skip steps: i=end r=end d=end f=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@38 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 +@38 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6667 [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 sp=41 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@39 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 +@39 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6668 [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 sp=41 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@40 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535 +@40 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -174,15 +174,15 @@ [ Skip steps: i=end r=end d=end f=end p=end sa=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@44 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 +@44 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6667 [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 sp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@45 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 +@45 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6668 [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 sp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@46 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 +@46 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -198,15 +198,15 @@ [ Skip steps: i=end r=end d=end f=end p=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@50 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 +@50 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6667 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 sp=53 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@51 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 +@51 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6668 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 sp=53 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@52 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535 +@52 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -222,15 +222,15 @@ [ Skip steps: i=end r=end d=end f=end p=end sa=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@56 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 +@56 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6667 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@57 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 +@57 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6668 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@58 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 +@58 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 12.34.56.78 port 6669:65535 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf4.ok b/regress/sbin/pfctl/pf4.ok index c2fa6d44b06..5f6c9c1d908 100644 --- a/regress/sbin/pfctl/pf4.ok +++ b/regress/sbin/pfctl/pf4.ok @@ -7,56 +7,56 @@ block drop in inet from 10.0.0.0/8 to any block drop in inet from ! 10.0.0.0/8 to any block drop in inet from 10.0.0.0/8 to any block drop in inet from 172.16.0.0/12 to any -block drop in proto tcp from any port = ssh to any -block drop in proto tcp from any port = ssh to any port 1024:2048 +block drop in proto tcp from any port = 22 to any +block drop in proto tcp from any port = 22 to any port 1024:2048 block drop in proto tcp from any port 21 >< 2048 to any port 1024:2048 block drop in proto tcp from any port != 1234 to any port 1024:2048 block drop in proto tcp from any port >= 80 to any port 1024:2048 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535 -block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667 -block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 -block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port 6669:65535 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 -block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667 -block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668 -block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port 6669:65535 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535 -block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667 -block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 -block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port 6669:65535 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 -block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667 -block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668 -block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port 6669:65535 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535 +block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6667 +block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6668 +block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port 6669:65535 +block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667 +block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668 +block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port 6669:65535 +block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6667 +block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6668 +block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 12.34.56.78 port 6669:65535 +block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 +block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668 +block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 12.34.56.78 port 6669:65535 +block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6667 +block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6668 +block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port 6669:65535 +block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667 +block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668 +block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port 6669:65535 +block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6667 +block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6668 +block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 12.34.56.78 port 6669:65535 +block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667 +block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668 +block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 12.34.56.78 port 6669:65535 +block drop in inet proto udp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6667 +block drop in inet proto udp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6668 +block drop in inet proto udp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port 6669:65535 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port 6669:65535 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 +block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6667 +block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6668 +block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port 6669:65535 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535 +block drop in inet proto udp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6667 +block drop in inet proto udp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6668 +block drop in inet proto udp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port 6669:65535 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port 6669:65535 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 +block drop in inet proto udp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6667 +block drop in inet proto udp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6668 +block drop in inet proto udp from 172.16.0.0/12 port = 22 to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port 6669:65535 diff --git a/regress/sbin/pfctl/pf40.loaded b/regress/sbin/pfctl/pf40.loaded index 710a067c92f..0bca07e8d69 100644 --- a/regress/sbin/pfctl/pf40.loaded +++ b/regress/sbin/pfctl/pf40.loaded @@ -74,7 +74,7 @@ [ Skip steps: r=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass out on lo0 proto tcp from any to any port = smtp flags S/SA +@19 pass out on lo0 proto tcp from any to any port = 25 flags S/SA [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf40.ok b/regress/sbin/pfctl/pf40.ok index 9781cce6610..164bd0a3288 100644 --- a/regress/sbin/pfctl/pf40.ok +++ b/regress/sbin/pfctl/pf40.ok @@ -17,4 +17,4 @@ pass proto tcp all flags S/SA pass proto udp all pass in proto udp all pass out proto udp all -pass out on lo0 proto tcp from any to any port = smtp flags S/SA +pass out on lo0 proto tcp from any to any port = 25 flags S/SA diff --git a/regress/sbin/pfctl/pf41.ok b/regress/sbin/pfctl/pf41.ok index 89e4608cfc3..39cb27a210f 100644 --- a/regress/sbin/pfctl/pf41.ok +++ b/regress/sbin/pfctl/pf41.ok @@ -5,8 +5,8 @@ anchor "foo" inet all anchor "foo" inet6 all anchor "foo" inet all anchor "foo" proto tcp all -anchor "foo" inet proto tcp from 10.1.2.3 port = smtp to 10.2.3.4 port = ssh +anchor "foo" inet proto tcp from 10.1.2.3 port = 25 to 10.2.3.4 port = 22 anchor "foobar" inet6 proto udp from ::1 port = 1 to ::1 port = 2 -anchor "filteropt" out proto tcp from any to any port = ssh user = 0 -anchor "filteropt" in proto tcp from any to (self) port = ssh group = 27 +anchor "filteropt" out proto tcp from any to any port = 22 user = 0 +anchor "filteropt" in proto tcp from any to (self) port = 22 group = 27 anchor "filteropt" out inet proto icmp all icmp-type echoreq diff --git a/regress/sbin/pfctl/pf43.loaded b/regress/sbin/pfctl/pf43.loaded index c971e64a437..3af200b730c 100644 --- a/regress/sbin/pfctl/pf43.loaded +++ b/regress/sbin/pfctl/pf43.loaded @@ -1,20 +1,20 @@ -@0 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio) +@0 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 queue(bulk, prio) [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue bulk +@1 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 queue bulk [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio) +@2 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 queue(bulk, prio) [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue bulk +@3 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 queue bulk [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio) +@4 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 queue(bulk, prio) [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf43.ok b/regress/sbin/pfctl/pf43.ok index 47e6d30818a..179a0030be7 100644 --- a/regress/sbin/pfctl/pf43.ok +++ b/regress/sbin/pfctl/pf43.ok @@ -1,8 +1,8 @@ altq on lo0 cbq bandwidth 100Mb tbrsize 3648 queue { bulk urgent } queue bulk bandwidth 70% cbq( default ) queue urgent bandwidth 30% priority 7 -pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA queue(bulk, urgent) -pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA queue bulk -pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA queue(bulk, urgent) -pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA queue bulk -pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA queue(bulk, urgent) +pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA queue(bulk, urgent) +pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA queue bulk +pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA queue(bulk, urgent) +pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA queue bulk +pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA queue(bulk, urgent) diff --git a/regress/sbin/pfctl/pf5.loaded b/regress/sbin/pfctl/pf5.loaded index 175d83d0111..63af3d0d442 100644 --- a/regress/sbin/pfctl/pf5.loaded +++ b/regress/sbin/pfctl/pf5.loaded @@ -1,16 +1,16 @@ -@0 block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 6667 +@0 block drop in inet proto udp from 10.0.0.0/8 port = 7 to 12.34.56.78 port = 6667 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=2 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 16 +@1 block drop in inet proto udp from 10.0.0.0/8 port = 7 to 12.34.56.78 port = 16 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 +@2 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6667 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 16 +@3 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 16 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf5.ok b/regress/sbin/pfctl/pf5.ok index b3f7c2c99f8..50a0371e9f5 100644 --- a/regress/sbin/pfctl/pf5.ok +++ b/regress/sbin/pfctl/pf5.ok @@ -1,10 +1,10 @@ foo = "ssh, ftp" bar = "other thing" inside = "10.0.0.0/8" -block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 6667 -block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 16 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 16 +block drop in inet proto udp from 10.0.0.0/8 port = 7 to 12.34.56.78 port = 6667 +block drop in inet proto udp from 10.0.0.0/8 port = 7 to 12.34.56.78 port = 16 +block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6667 +block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 16 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 16 block drop in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 6667 diff --git a/regress/sbin/pfctl/pf5.optimized b/regress/sbin/pfctl/pf5.optimized index cbb8a278898..73598f63a1e 100644 --- a/regress/sbin/pfctl/pf5.optimized +++ b/regress/sbin/pfctl/pf5.optimized @@ -1,8 +1,8 @@ -@0 block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 6667 +@0 block drop in inet proto udp from 10.0.0.0/8 port = 7 to 12.34.56.78 port = 6667 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 +@1 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6667 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -14,11 +14,11 @@ [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 16 +@4 block drop in inet proto udp from 10.0.0.0/8 port = 7 to 12.34.56.78 port = 16 [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 16 +@5 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 16 [ Skip steps: i=end r=end d=end f=end p=end sa=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/pf56.loaded b/regress/sbin/pfctl/pf56.loaded index 2ecd0d2e637..cf602b9a147 100644 --- a/regress/sbin/pfctl/pf56.loaded +++ b/regress/sbin/pfctl/pf56.loaded @@ -1,8 +1,8 @@ -@0 pass in proto tcp from any to any port = www flags S/SA keep state (tcp.established 60) +@0 pass in proto tcp from any to any port = 80 flags S/SA keep state (tcp.established 60) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in proto tcp from any to any port = www flags S/SA keep state (max 10, no-sync, tcp.first 2, adaptive.start 6, adaptive.end 12) +@1 pass in proto tcp from any to any port = 80 flags S/SA keep state (max 10, no-sync, tcp.first 2, adaptive.start 6, adaptive.end 12) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf56.ok b/regress/sbin/pfctl/pf56.ok index f7ce36fecc5..05fc8865433 100644 --- a/regress/sbin/pfctl/pf56.ok +++ b/regress/sbin/pfctl/pf56.ok @@ -1,2 +1,2 @@ -pass in proto tcp from any to any port = www flags S/SA keep state (tcp.established 60) -pass in proto tcp from any to any port = www flags S/SA keep state (max 10, no-sync, tcp.first 2, adaptive.start 6, adaptive.end 12) +pass in proto tcp from any to any port = 80 flags S/SA keep state (tcp.established 60) +pass in proto tcp from any to any port = 80 flags S/SA keep state (max 10, no-sync, tcp.first 2, adaptive.start 6, adaptive.end 12) diff --git a/regress/sbin/pfctl/pf56.optimized b/regress/sbin/pfctl/pf56.optimized index 2ecd0d2e637..cf602b9a147 100644 --- a/regress/sbin/pfctl/pf56.optimized +++ b/regress/sbin/pfctl/pf56.optimized @@ -1,8 +1,8 @@ -@0 pass in proto tcp from any to any port = www flags S/SA keep state (tcp.established 60) +@0 pass in proto tcp from any to any port = 80 flags S/SA keep state (tcp.established 60) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in proto tcp from any to any port = www flags S/SA keep state (max 10, no-sync, tcp.first 2, adaptive.start 6, adaptive.end 12) +@1 pass in proto tcp from any to any port = 80 flags S/SA keep state (max 10, no-sync, tcp.first 2, adaptive.start 6, adaptive.end 12) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf68.loaded b/regress/sbin/pfctl/pf68.loaded index f9460827bce..16d022945cb 100644 --- a/regress/sbin/pfctl/pf68.loaded +++ b/regress/sbin/pfctl/pf68.loaded @@ -1,4 +1,4 @@ -@0 match on lo0 inet proto tcp from 192.168.1.1 port = 1024 to any port = www +@0 match on lo0 inet proto tcp from 192.168.1.1 port = 1024 to any port = 80 [ Skip steps: r=4 d=end p=end da=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -122,55 +122,55 @@ [ Skip steps: i=38 r=32 d=end f=34 p=end sa=32 da=34 sp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@31 match proto tcp from any to any port = www +@31 match proto tcp from any to any port = 80 [ Skip steps: i=38 d=end f=34 p=end da=34 sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@32 match in proto tcp from <regress.1:*> to any port = www +@32 match in proto tcp from <regress.1:*> to any port = 80 [ Skip steps: i=38 r=58 d=end f=34 p=end da=34 sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@33 match in proto tcp from ! <regress.2:*> to any port = www +@33 match in proto tcp from ! <regress.2:*> to any port = 80 [ Skip steps: i=38 r=58 d=end p=end sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@34 match in inet proto tcp from 10.0.0.1 to 10.0.0.3 port = www +@34 match in inet proto tcp from 10.0.0.1 to 10.0.0.3 port = 80 [ Skip steps: i=38 r=58 d=end f=38 p=end sa=36 sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@35 match in inet proto tcp from 10.0.0.1 to 10.0.0.4 port = www +@35 match in inet proto tcp from 10.0.0.1 to 10.0.0.4 port = 80 [ Skip steps: i=38 r=58 d=end f=38 p=end sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@36 match in inet proto tcp from 10.0.0.2 to 10.0.0.3 port = www +@36 match in inet proto tcp from 10.0.0.2 to 10.0.0.3 port = 80 [ Skip steps: i=38 r=58 d=end f=38 p=end sa=38 sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@37 match in inet proto tcp from 10.0.0.2 to 10.0.0.4 port = www +@37 match in inet proto tcp from 10.0.0.2 to 10.0.0.4 port = 80 [ Skip steps: r=58 d=end p=end sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@38 match in log on lo0 proto tcp from any to any port = www scrub (min-ttl 25) +@38 match in log on lo0 proto tcp from any to any port = 80 scrub (min-ttl 25) [ Skip steps: i=42 r=58 d=end p=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@39 match in log on lo0 inet6 proto tcp from (lo1000000:*) port = www to 2000::1 +@39 match in log on lo0 inet6 proto tcp from (lo1000000:*) port = 80 to 2000::1 [ Skip steps: i=42 r=58 d=end f=41 p=end da=41 sp=44 dp=45 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@40 match in log on lo0 inet6 proto tcp from (lo0:2) port = www to 2000::1 +@40 match in log on lo0 inet6 proto tcp from (lo0:2) port = 80 to 2000::1 [ Skip steps: i=42 r=58 d=end p=end sp=44 dp=45 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@41 match in log on lo0 proto tcp from any port = www to any +@41 match in log on lo0 proto tcp from any port = 80 to any [ Skip steps: r=58 d=end f=57 p=end sa=57 da=59 sp=44 dp=45 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@42 match in log on lo1000000 proto tcp from any port = www to any +@42 match in log on lo1000000 proto tcp from any port = 80 to any [ Skip steps: r=58 d=end f=57 p=end sa=57 da=59 sp=44 dp=45 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@43 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) +@43 match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224) [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 dp=45 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -178,19 +178,19 @@ [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@45 match in on lo0 proto tcp from any to any port = www scrub (max-mss 224) +@45 match in on lo0 proto tcp from any to any port = 80 scrub (max-mss 224) [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@46 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) +@46 match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224) [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=48 dp=48 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@47 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) +@47 match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224) [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@48 match in on lo0 proto tcp from any to any port = www scrub (no-df min-ttl 15 max-mss 224) +@48 match in on lo0 proto tcp from any to any port = 80 scrub (no-df min-ttl 15 max-mss 224) [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=51 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -202,19 +202,19 @@ [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@51 match in on lo0 proto tcp from any port = www to any port = www scrub (no-df) +@51 match in on lo0 proto tcp from any port = 80 to any port = 80 scrub (no-df) [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=54 dp=53 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@52 match in on lo0 proto tcp from any port = www to any port = www scrub (no-df min-ttl 15 max-mss 224) +@52 match in on lo0 proto tcp from any port = 80 to any port = 80 scrub (no-df min-ttl 15 max-mss 224) [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=54 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@53 match in on lo0 proto tcp from any port = www to any port = 81 scrub (no-df min-ttl 15 max-mss 224) +@53 match in on lo0 proto tcp from any port = 80 to any port = 81 scrub (no-df min-ttl 15 max-mss 224) [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@54 match in on lo0 proto tcp from any port = 81 to any port = www scrub (no-df min-ttl 15 max-mss 224) +@54 match in on lo0 proto tcp from any port = 81 to any port = 80 scrub (no-df min-ttl 15 max-mss 224) [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=56 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -226,23 +226,23 @@ [ Skip steps: i=59 r=58 d=end p=end da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@57 match in on lo0 inet proto tcp from (lo0:1) port = www to any +@57 match in on lo0 inet proto tcp from (lo0:1) port = 80 to any [ Skip steps: i=59 d=end p=end da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@58 match on lo0 proto tcp from any to any port = www scrub (max-mss 224) +@58 match on lo0 proto tcp from any to any port = 80 scrub (max-mss 224) [ Skip steps: d=end f=61 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@59 match out proto tcp from any to ! <regress.1:*> port = www +@59 match out proto tcp from any to ! <regress.1:*> port = 80 [ Skip steps: i=61 r=end d=end f=61 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@60 match out proto tcp from any to <regress.2:*> port = www +@60 match out proto tcp from any to <regress.2:*> port = 80 [ Skip steps: r=end 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 ] -@61 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www scrub (no-df max-mss 224) +@61 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = 80 scrub (no-df max-mss 224) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf68.ok b/regress/sbin/pfctl/pf68.ok index 273073f8507..5b3f19296db 100644 --- a/regress/sbin/pfctl/pf68.ok +++ b/regress/sbin/pfctl/pf68.ok @@ -1,4 +1,4 @@ -match on lo0 inet proto tcp from 192.168.1.1 port = 1024 to any port = www +match on lo0 inet proto tcp from 192.168.1.1 port = 1024 to any port = 80 match proto tcp all match proto tcp all match proto tcp all @@ -29,34 +29,34 @@ match out proto tcp from any to ! <regress.1> match out proto tcp from any to <regress.2> match out log on lo1000000 inet proto tcp from any to 10.0.0.1 scrub (no-df max-mss 224) match proto tcp all scrub (random-id) -match proto tcp from any to any port = www -match in proto tcp from <regress.1> to any port = www -match in proto tcp from ! <regress.2> to any port = www -match in inet proto tcp from 10.0.0.1 to 10.0.0.3 port = www -match in inet proto tcp from 10.0.0.1 to 10.0.0.4 port = www -match in inet proto tcp from 10.0.0.2 to 10.0.0.3 port = www -match in inet proto tcp from 10.0.0.2 to 10.0.0.4 port = www -match in log on lo0 proto tcp from any to any port = www scrub (min-ttl 25) -match in log on lo0 inet6 proto tcp from (lo1000000) port = www to 2000::1 -match in log on lo0 inet6 proto tcp from (lo0) port = www to 2000::1 -match in log on lo0 proto tcp from any port = www to any -match in log on lo1000000 proto tcp from any port = www to any -match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) +match proto tcp from any to any port = 80 +match in proto tcp from <regress.1> to any port = 80 +match in proto tcp from ! <regress.2> to any port = 80 +match in inet proto tcp from 10.0.0.1 to 10.0.0.3 port = 80 +match in inet proto tcp from 10.0.0.1 to 10.0.0.4 port = 80 +match in inet proto tcp from 10.0.0.2 to 10.0.0.3 port = 80 +match in inet proto tcp from 10.0.0.2 to 10.0.0.4 port = 80 +match in log on lo0 proto tcp from any to any port = 80 scrub (min-ttl 25) +match in log on lo0 inet6 proto tcp from (lo1000000) port = 80 to 2000::1 +match in log on lo0 inet6 proto tcp from (lo0) port = 80 to 2000::1 +match in log on lo0 proto tcp from any port = 80 to any +match in log on lo1000000 proto tcp from any port = 80 to any +match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224) match in on lo0 proto tcp from any port = 81 to any scrub (no-df min-ttl 15 max-mss 224) -match in on lo0 proto tcp from any to any port = www scrub (max-mss 224) -match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) -match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) -match in on lo0 proto tcp from any to any port = www scrub (no-df min-ttl 15 max-mss 224) +match in on lo0 proto tcp from any to any port = 80 scrub (max-mss 224) +match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224) +match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224) +match in on lo0 proto tcp from any to any port = 80 scrub (no-df min-ttl 15 max-mss 224) match in on lo0 proto tcp from any to any port = 81 scrub (no-df min-ttl 15 max-mss 224) match in on lo0 proto tcp from any to any port = 82 scrub (no-df min-ttl 15 max-mss 224) -match in on lo0 proto tcp from any port = www to any port = www scrub (no-df) -match in on lo0 proto tcp from any port = www to any port = www scrub (no-df min-ttl 15 max-mss 224) -match in on lo0 proto tcp from any port = www to any port = 81 scrub (no-df min-ttl 15 max-mss 224) -match in on lo0 proto tcp from any port = 81 to any port = www scrub (no-df min-ttl 15 max-mss 224) +match in on lo0 proto tcp from any port = 80 to any port = 80 scrub (no-df) +match in on lo0 proto tcp from any port = 80 to any port = 80 scrub (no-df min-ttl 15 max-mss 224) +match in on lo0 proto tcp from any port = 80 to any port = 81 scrub (no-df min-ttl 15 max-mss 224) +match in on lo0 proto tcp from any port = 81 to any port = 80 scrub (no-df min-ttl 15 max-mss 224) match in on lo0 proto tcp from any port = 81 to any port = 81 scrub (no-df min-ttl 15 max-mss 224) match in on lo0 proto tcp from any to any port = 83 scrub (no-df min-ttl 15 max-mss 224) -match in on lo0 inet proto tcp from (lo0) port = www to any -match on lo0 proto tcp from any to any port = www scrub (max-mss 224) -match out proto tcp from any to ! <regress.1> port = www -match out proto tcp from any to <regress.2> port = www -match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www scrub (no-df max-mss 224) +match in on lo0 inet proto tcp from (lo0) port = 80 to any +match on lo0 proto tcp from any to any port = 80 scrub (max-mss 224) +match out proto tcp from any to ! <regress.1> port = 80 +match out proto tcp from any to <regress.2> port = 80 +match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = 80 scrub (no-df max-mss 224) diff --git a/regress/sbin/pfctl/pf68.optimized b/regress/sbin/pfctl/pf68.optimized index d9766c66e3a..d7950b34086 100644 --- a/regress/sbin/pfctl/pf68.optimized +++ b/regress/sbin/pfctl/pf68.optimized @@ -74,27 +74,27 @@ [ Skip steps: i=21 r=20 d=end f=35 p=end sa=20 da=32 sp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 match proto tcp from any to any port = www +@19 match proto tcp from any to any port = 80 [ Skip steps: i=21 d=end f=35 p=end da=32 sp=22 dp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 match in proto tcp from ! <regress.2:*> to any port = www +@20 match in proto tcp from ! <regress.2:*> to any port = 80 [ Skip steps: r=32 d=end f=35 p=end da=32 sp=22 dp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 match in log on lo0 proto tcp from any to any port = www scrub (min-ttl 25) +@21 match in log on lo0 proto tcp from any to any port = 80 scrub (min-ttl 25) [ Skip steps: i=23 r=32 d=end f=35 p=end sa=35 da=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@22 match in log on lo0 proto tcp from any port = www to any +@22 match in log on lo0 proto tcp from any port = 80 to any [ Skip steps: r=32 d=end f=35 p=end sa=35 da=32 sp=25 dp=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@23 match in log on lo1000000 proto tcp from any port = www to any +@23 match in log on lo1000000 proto tcp from any port = 80 to any [ Skip steps: r=32 d=end f=35 p=end sa=35 da=32 sp=25 dp=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@24 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) +@24 match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224) [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 dp=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -102,15 +102,15 @@ [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@26 match in on lo0 proto tcp from any to any port = www scrub (max-mss 224) +@26 match in on lo0 proto tcp from any to any port = 80 scrub (max-mss 224) [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@27 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) +@27 match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224) [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@28 match in on lo0 proto tcp from any to any port = www scrub (no-df min-ttl 15 max-mss 224) +@28 match in on lo0 proto tcp from any to any port = 80 scrub (no-df min-ttl 15 max-mss 224) [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 sp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -126,23 +126,23 @@ [ Skip steps: d=end f=35 p=end sa=35 sp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@32 match out proto tcp from any to ! <regress.1:*> port = www +@32 match out proto tcp from any to ! <regress.1:*> port = 80 [ Skip steps: i=34 r=34 d=end f=35 p=end sa=35 sp=35 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@33 match out proto tcp from any to <regress.2:*> port = www +@33 match out proto tcp from any to <regress.2:*> port = 80 [ Skip steps: d=end f=35 p=end sa=35 sp=35 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@34 match on lo0 proto tcp from any to any port = www scrub (max-mss 224) +@34 match on lo0 proto tcp from any to any port = 80 scrub (max-mss 224) [ Skip steps: i=36 d=end p=end da=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@35 match in on lo0 inet proto tcp from (lo0:1) port = www to any +@35 match in on lo0 inet proto tcp from (lo0:1) port = 80 to any [ Skip steps: d=end f=end p=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@36 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www scrub (no-df max-mss 224) +@36 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = 80 scrub (no-df max-mss 224) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf7.loaded b/regress/sbin/pfctl/pf7.loaded index b114ca78ae0..ea85d48dcf3 100644 --- a/regress/sbin/pfctl/pf7.loaded +++ b/regress/sbin/pfctl/pf7.loaded @@ -58,7 +58,7 @@ [ Skip steps: i=end d=end f=end p=16 sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in on tun1000000 proto udp from any to any port = domain +@15 pass in on tun1000000 proto udp from any to any port = 53 [ Skip steps: i=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -90,19 +90,19 @@ [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@23 pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA modulate state +@23 pass in on tun1000000 proto tcp from any to any port = 22 flags S/SA modulate state [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@24 pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA modulate state +@24 pass in on tun1000000 proto tcp from any to any port = 25 flags S/SA modulate state [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@25 pass in on tun1000000 proto tcp from any to any port = domain flags S/SA modulate state +@25 pass in on tun1000000 proto tcp from any to any port = 53 flags S/SA modulate state [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@26 pass in on tun1000000 proto tcp from any to any port = auth flags S/SA modulate state +@26 pass in on tun1000000 proto tcp from any to any port = 113 flags S/SA modulate state [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf7.ok b/regress/sbin/pfctl/pf7.ok index 08b9fc2bacb..22762e1c28e 100644 --- a/regress/sbin/pfctl/pf7.ok +++ b/regress/sbin/pfctl/pf7.ok @@ -13,7 +13,7 @@ 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 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 pass out on tun1000000 proto udp all -pass in on tun1000000 proto udp from any to any port = domain +pass in on tun1000000 proto udp from any to any port = 53 pass out on tun1000000 proto tcp all flags S/SA modulate state pass in on tun1000000 proto tcp all flags S/SA modulate state pass in on tun1000000 proto udp all @@ -21,7 +21,7 @@ pass in on tun1000000 proto icmp all pass in on tun1000000 proto udp all pass in on tun1000000 proto tcp all flags S/SA synproxy state pass in on tun1000000 proto icmp all -pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA modulate state -pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA modulate state -pass in on tun1000000 proto tcp from any to any port = domain flags S/SA modulate state -pass in on tun1000000 proto tcp from any to any port = auth flags S/SA modulate state +pass in on tun1000000 proto tcp from any to any port = 22 flags S/SA modulate state +pass in on tun1000000 proto tcp from any to any port = 25 flags S/SA modulate state +pass in on tun1000000 proto tcp from any to any port = 53 flags S/SA modulate state +pass in on tun1000000 proto tcp from any to any port = 113 flags S/SA modulate state diff --git a/regress/sbin/pfctl/pf7.optimized b/regress/sbin/pfctl/pf7.optimized index d0bbee1432f..2c7d2772ede 100644 --- a/regress/sbin/pfctl/pf7.optimized +++ b/regress/sbin/pfctl/pf7.optimized @@ -58,7 +58,7 @@ [ Skip steps: i=end r=16 d=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in on tun1000000 proto udp from any to any port = domain +@15 pass in on tun1000000 proto udp from any to any port = 53 [ Skip steps: i=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -86,19 +86,19 @@ [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@22 pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA modulate state +@22 pass in on tun1000000 proto tcp from any to any port = 22 flags S/SA modulate state [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@23 pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA modulate state +@23 pass in on tun1000000 proto tcp from any to any port = 25 flags S/SA modulate state [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@24 pass in on tun1000000 proto tcp from any to any port = domain flags S/SA modulate state +@24 pass in on tun1000000 proto tcp from any to any port = 53 flags S/SA modulate state [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@25 pass in on tun1000000 proto tcp from any to any port = auth flags S/SA modulate state +@25 pass in on tun1000000 proto tcp from any to any port = 113 flags S/SA modulate state [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf71.loaded b/regress/sbin/pfctl/pf71.loaded index da644e740ad..7c79e53c070 100644 --- a/regress/sbin/pfctl/pf71.loaded +++ b/regress/sbin/pfctl/pf71.loaded @@ -1,4 +1,4 @@ -@0 match in on lo0 inet proto tcp from 10.0.0.0/8 to any port = www rdr-to 127.0.0.1 +@0 match in on lo0 inet proto tcp from 10.0.0.0/8 to any port = 80 rdr-to 127.0.0.1 [ Skip steps: i=end d=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf71.ok b/regress/sbin/pfctl/pf71.ok index f53304f7450..6cbc0bbf6f7 100644 --- a/regress/sbin/pfctl/pf71.ok +++ b/regress/sbin/pfctl/pf71.ok @@ -1,2 +1,2 @@ -match in on lo0 inet proto tcp from 10.0.0.0/8 to any port = www rdr-to 127.0.0.1 +match in on lo0 inet proto tcp from 10.0.0.0/8 to any port = 80 rdr-to 127.0.0.1 block drop out on lo0 all tagged regress diff --git a/regress/sbin/pfctl/pf71.optimized b/regress/sbin/pfctl/pf71.optimized index da644e740ad..7c79e53c070 100644 --- a/regress/sbin/pfctl/pf71.optimized +++ b/regress/sbin/pfctl/pf71.optimized @@ -1,4 +1,4 @@ -@0 match in on lo0 inet proto tcp from 10.0.0.0/8 to any port = www rdr-to 127.0.0.1 +@0 match in on lo0 inet proto tcp from 10.0.0.0/8 to any port = 80 rdr-to 127.0.0.1 [ Skip steps: i=end d=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf75.loaded b/regress/sbin/pfctl/pf75.loaded index 8bd1156119b..3aed65d238c 100644 --- a/regress/sbin/pfctl/pf75.loaded +++ b/regress/sbin/pfctl/pf75.loaded @@ -1,4 +1,4 @@ -@0 block drop in on lo0 inet proto tcp from 192.168.0.0/24 to any port = ssh tag ssh +@0 block drop in on lo0 inet proto tcp from 192.168.0.0/24 to any port = 22 tag ssh [ Skip steps: i=end r=end d=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf75.ok b/regress/sbin/pfctl/pf75.ok index 460715b5dd2..40a61585bf3 100644 --- a/regress/sbin/pfctl/pf75.ok +++ b/regress/sbin/pfctl/pf75.ok @@ -1,2 +1,2 @@ -block drop in on lo0 inet proto tcp from 192.168.0.0/24 to any port = ssh tag ssh +block drop in on lo0 inet proto tcp from 192.168.0.0/24 to any port = 22 tag ssh block drop in quick on lo0 all ! tagged ssh diff --git a/regress/sbin/pfctl/pf75.optimized b/regress/sbin/pfctl/pf75.optimized index 8bd1156119b..3aed65d238c 100644 --- a/regress/sbin/pfctl/pf75.optimized +++ b/regress/sbin/pfctl/pf75.optimized @@ -1,4 +1,4 @@ -@0 block drop in on lo0 inet proto tcp from 192.168.0.0/24 to any port = ssh tag ssh +@0 block drop in on lo0 inet proto tcp from 192.168.0.0/24 to any port = 22 tag ssh [ Skip steps: i=end r=end d=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf80.loaded b/regress/sbin/pfctl/pf80.loaded index e6faf3d07ad..f5dddbad5b0 100644 --- a/regress/sbin/pfctl/pf80.loaded +++ b/regress/sbin/pfctl/pf80.loaded @@ -2,7 +2,7 @@ [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +@1 pass in on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080 [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -18,7 +18,7 @@ [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +@5 pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080 [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -34,7 +34,7 @@ [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +@9 pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080 [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -50,7 +50,7 @@ [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 match in log on lo0 inet proto tcp from any to 1.2.3.4 port = www rdr-to 127.0.0.1 port 8080 +@13 match in log on lo0 inet proto tcp from any to 1.2.3.4 port = 80 rdr-to 127.0.0.1 port 8080 [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf80.ok b/regress/sbin/pfctl/pf80.ok index aa951d816af..1b770c05893 100644 --- a/regress/sbin/pfctl/pf80.ok +++ b/regress/sbin/pfctl/pf80.ok @@ -1,16 +1,16 @@ pass out on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 -pass in on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +pass in on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080 pass out on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port pass in on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 pass out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 -pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080 pass out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port pass in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 pass out log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 -pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080 pass out log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port pass in log (all) on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 match out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 nat-to 172.16.0.1 -match in log on lo0 inet proto tcp from any to 1.2.3.4 port = www rdr-to 127.0.0.1 port 8080 +match in log on lo0 inet proto tcp from any to 1.2.3.4 port = 80 rdr-to 127.0.0.1 port 8080 match out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 nat-to 12.0.0.0/8 static-port match in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 rdr-to 10.0.0.0/8 diff --git a/regress/sbin/pfctl/pf80.optimized b/regress/sbin/pfctl/pf80.optimized index e6faf3d07ad..f5dddbad5b0 100644 --- a/regress/sbin/pfctl/pf80.optimized +++ b/regress/sbin/pfctl/pf80.optimized @@ -2,7 +2,7 @@ [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +@1 pass in on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080 [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -18,7 +18,7 @@ [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +@5 pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080 [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -34,7 +34,7 @@ [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +@9 pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080 [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -50,7 +50,7 @@ [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 match in log on lo0 inet proto tcp from any to 1.2.3.4 port = www rdr-to 127.0.0.1 port 8080 +@13 match in log on lo0 inet proto tcp from any to 1.2.3.4 port = 80 rdr-to 127.0.0.1 port 8080 [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf84.loaded b/regress/sbin/pfctl/pf84.loaded index e3eba071e5a..f7697aa9e83 100644 --- a/regress/sbin/pfctl/pf84.loaded +++ b/regress/sbin/pfctl/pf84.loaded @@ -10,19 +10,19 @@ [ Skip steps: r=end d=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in proto tcp from any to any port = ssh flags S/SA keep state (source-track global) +@3 pass in proto tcp from any to any port = 22 flags S/SA keep state (source-track global) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in proto tcp from any to any port = smtp flags S/SA keep state (source-track global) +@4 pass in proto tcp from any to any port = 25 flags S/SA keep state (source-track global) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in proto tcp from any to any port = www flags S/SA keep state (source-track rule, max-src-states 3, max-src-nodes 1000) +@5 pass in proto tcp from any to any port = 80 flags S/SA keep state (source-track rule, max-src-states 3, max-src-nodes 1000) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in proto tcp from any to any port = ntp flags S/SA keep state (source-track rule, max-src-nodes 1000) +@6 pass in proto tcp from any to any port = 123 flags S/SA keep state (source-track rule, max-src-nodes 1000) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf84.ok b/regress/sbin/pfctl/pf84.ok index d693fbcfcd9..f1f205b5624 100644 --- a/regress/sbin/pfctl/pf84.ok +++ b/regress/sbin/pfctl/pf84.ok @@ -3,8 +3,8 @@ table <__automatic_1> const { 10.0.0.1 10.0.0.2 } match out on tun1000000 inet from 10.0.0.0/24 to any nat-to <__automatic_0> round-robin sticky-address match in on tun1000000 inet from any to 10.0.1.1 rdr-to 10.0.0.0/24 random sticky-address match in on tun1000000 inet from any to 10.0.1.2 rdr-to <__automatic_1> round-robin sticky-address -pass in proto tcp from any to any port = ssh flags S/SA keep state (source-track global) -pass in proto tcp from any to any port = smtp flags S/SA keep state (source-track global) -pass in proto tcp from any to any port = www flags S/SA keep state (source-track rule, max-src-states 3, max-src-nodes 1000) -pass in proto tcp from any to any port = ntp flags S/SA keep state (source-track rule, max-src-nodes 1000) +pass in proto tcp from any to any port = 22 flags S/SA keep state (source-track global) +pass in proto tcp from any to any port = 25 flags S/SA keep state (source-track global) +pass in proto tcp from any to any port = 80 flags S/SA keep state (source-track rule, max-src-states 3, max-src-nodes 1000) +pass in proto tcp from any to any port = 123 flags S/SA keep state (source-track rule, max-src-nodes 1000) pass in proto tcp from any to any port = 321 flags S/SA keep state (source-track global, max-src-states 3) diff --git a/regress/sbin/pfctl/pf84.optimized b/regress/sbin/pfctl/pf84.optimized index e3eba071e5a..f7697aa9e83 100644 --- a/regress/sbin/pfctl/pf84.optimized +++ b/regress/sbin/pfctl/pf84.optimized @@ -10,19 +10,19 @@ [ Skip steps: r=end d=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in proto tcp from any to any port = ssh flags S/SA keep state (source-track global) +@3 pass in proto tcp from any to any port = 22 flags S/SA keep state (source-track global) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in proto tcp from any to any port = smtp flags S/SA keep state (source-track global) +@4 pass in proto tcp from any to any port = 25 flags S/SA keep state (source-track global) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in proto tcp from any to any port = www flags S/SA keep state (source-track rule, max-src-states 3, max-src-nodes 1000) +@5 pass in proto tcp from any to any port = 80 flags S/SA keep state (source-track rule, max-src-states 3, max-src-nodes 1000) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in proto tcp from any to any port = ntp flags S/SA keep state (source-track rule, max-src-nodes 1000) +@6 pass in proto tcp from any to any port = 123 flags S/SA keep state (source-track rule, max-src-nodes 1000) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf87.loaded b/regress/sbin/pfctl/pf87.loaded index 065b99c6270..5cb44b3b61b 100644 --- a/regress/sbin/pfctl/pf87.loaded +++ b/regress/sbin/pfctl/pf87.loaded @@ -1,28 +1,28 @@ -@0 pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +@0 pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA [ Skip steps: r=5 d=end f=end p=2 da=2 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo1000001 inet proto tcp from 10.0.0.1 port = ssh to 10.0.0.2 flags S/SA +@1 pass in on lo1000001 inet proto tcp from 10.0.0.1 port = 22 to 10.0.0.2 flags S/SA [ Skip steps: i=3 r=5 d=end f=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = domain +@2 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = 53 [ Skip steps: r=5 d=end f=end p=4 sp=9 dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = domain +@3 pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = 53 [ Skip steps: r=5 d=end f=end sa=9 sp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet proto tcp from any to 10.0.0.1 port = www flags S/SA +@4 pass in inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA [ Skip steps: d=end f=end sa=9 sp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = domain +@5 pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = 53 [ Skip steps: d=end f=end sa=9 sp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in inet proto tcp from any to 10.0.0.3 port = www flags S/SA +@6 pass in inet proto tcp from any to 10.0.0.3 port = 80 flags S/SA [ Skip steps: i=9 d=end f=end p=8 sa=9 sp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -30,35 +30,35 @@ [ Skip steps: i=9 d=end f=end sa=9 sp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in inet proto udp from any to 10.0.0.3 port = domain +@8 pass in inet proto udp from any to 10.0.0.3 port = 53 [ Skip steps: r=10 d=end f=end p=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in on lo1000001 inet proto udp from 10.0.0.2 port = domain to 10.0.0.2 +@9 pass in on lo1000001 inet proto udp from 10.0.0.2 port = 53 to 10.0.0.2 [ Skip steps: d=end f=end p=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass out inet proto udp from any to 10.0.0.1 port = domain +@10 pass out inet proto udp from any to 10.0.0.1 port = 53 [ Skip steps: r=14 d=end f=end p=13 sa=16 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = domain +@11 pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = 53 [ Skip steps: r=14 d=end f=end p=13 sa=16 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass out inet proto udp from any to 10.0.0.3 port = domain +@12 pass out inet proto udp from any to 10.0.0.3 port = 53 [ Skip steps: r=14 d=end f=end sa=16 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +@13 pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA [ Skip steps: d=end f=end p=15 sa=16 da=16 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +@14 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA [ Skip steps: i=18 r=17 d=end f=end sa=16 da=16 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = domain +@15 pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = 53 [ Skip steps: i=18 r=17 d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -66,19 +66,19 @@ [ Skip steps: i=18 d=end f=end p=19 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +@17 pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA [ Skip steps: r=19 d=end f=end p=19 sa=20 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass out inet proto tcp from any to 10.0.0.1 port = www flags S/SA +@18 pass out inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA [ Skip steps: i=20 d=end f=end sa=20 da=20 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass in inet proto udp from any to 10.0.0.1 port = domain +@19 pass in inet proto udp from any to 10.0.0.1 port = 53 [ Skip steps: r=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = ssh flags S/SA +@20 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = 22 flags S/SA [ Skip steps: i=end r=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf87.ok b/regress/sbin/pfctl/pf87.ok index a50c25b26e5..7a574f8c7fb 100644 --- a/regress/sbin/pfctl/pf87.ok +++ b/regress/sbin/pfctl/pf87.ok @@ -1,22 +1,22 @@ -pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA -pass in on lo1000001 inet proto tcp from 10.0.0.1 port = ssh to 10.0.0.2 flags S/SA -pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = domain -pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = domain -pass in inet proto tcp from any to 10.0.0.1 port = www flags S/SA -pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = domain -pass in inet proto tcp from any to 10.0.0.3 port = www flags S/SA +pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA +pass in on lo1000001 inet proto tcp from 10.0.0.1 port = 22 to 10.0.0.2 flags S/SA +pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = 53 +pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = 53 +pass in inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA +pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = 53 +pass in inet proto tcp from any to 10.0.0.3 port = 80 flags S/SA pass out inet proto tcp from any to 10.0.0.1 port = 81 flags S/SA -pass in inet proto udp from any to 10.0.0.3 port = domain -pass in on lo1000001 inet proto udp from 10.0.0.2 port = domain to 10.0.0.2 -pass out inet proto udp from any to 10.0.0.1 port = domain -pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = domain -pass out inet proto udp from any to 10.0.0.3 port = domain -pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA -pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA -pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = domain +pass in inet proto udp from any to 10.0.0.3 port = 53 +pass in on lo1000001 inet proto udp from 10.0.0.2 port = 53 to 10.0.0.2 +pass out inet proto udp from any to 10.0.0.1 port = 53 +pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = 53 +pass out inet proto udp from any to 10.0.0.3 port = 53 +pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA +pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA +pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = 53 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.4 flags S/SA -pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA -pass out inet proto tcp from any to 10.0.0.1 port = www flags S/SA -pass in inet proto udp from any to 10.0.0.1 port = domain -pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = ssh flags S/SA +pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA +pass out inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA +pass in inet proto udp from any to 10.0.0.1 port = 53 +pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = 22 flags S/SA pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.2 diff --git a/regress/sbin/pfctl/pf87.optimized b/regress/sbin/pfctl/pf87.optimized index d3bec92523b..be613b6209a 100644 --- a/regress/sbin/pfctl/pf87.optimized +++ b/regress/sbin/pfctl/pf87.optimized @@ -1,8 +1,8 @@ -@0 pass in on lo1000001 inet proto udp from 10.0.0.2 port = domain to 10.0.0.2 +@0 pass in on lo1000001 inet proto udp from 10.0.0.2 port = 53 to 10.0.0.2 [ Skip steps: i=8 r=14 d=end f=end p=3 da=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = domain +@1 pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = 53 [ Skip steps: i=8 r=14 d=end f=end p=3 da=5 sp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -10,11 +10,11 @@ [ Skip steps: i=8 r=14 d=end f=end da=5 dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on lo1000001 inet proto tcp from 10.0.0.1 port = ssh to 10.0.0.2 flags S/SA +@3 pass in on lo1000001 inet proto tcp from 10.0.0.1 port = 22 to 10.0.0.2 flags S/SA [ Skip steps: i=8 r=14 d=end f=end p=7 da=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +@4 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA [ Skip steps: i=8 r=14 d=end f=end p=7 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -22,59 +22,59 @@ [ Skip steps: i=8 r=14 d=end f=end p=7 sa=7 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = ssh flags S/SA +@6 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = 22 flags S/SA [ Skip steps: i=8 r=14 d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = domain +@7 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = 53 [ Skip steps: r=14 d=end f=end p=11 sp=end dp=11 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = domain +@8 pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = 53 [ Skip steps: r=14 d=end f=end p=11 sa=end sp=end dp=11 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in inet proto udp from any to 10.0.0.3 port = domain +@9 pass in inet proto udp from any to 10.0.0.3 port = 53 [ Skip steps: i=13 r=14 d=end f=end p=11 sa=end sp=end dp=11 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass in inet proto udp from any to 10.0.0.1 port = domain +@10 pass in inet proto udp from any to 10.0.0.1 port = 53 [ Skip steps: i=13 r=14 d=end f=end sa=end da=12 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass in inet proto tcp from any to 10.0.0.1 port = www flags S/SA +@11 pass in inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA [ Skip steps: i=13 r=14 d=end f=end p=14 sa=end sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass in inet proto tcp from any to 10.0.0.3 port = www flags S/SA +@12 pass in inet proto tcp from any to 10.0.0.3 port = 80 flags S/SA [ Skip steps: r=14 d=end f=end p=14 sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +@13 pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA [ Skip steps: d=end f=end sa=end da=16 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = domain +@14 pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = 53 [ Skip steps: r=end d=end f=end p=18 sa=end da=16 sp=end dp=18 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = domain +@15 pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = 53 [ Skip steps: r=end d=end f=end p=18 sa=end sp=end dp=18 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass out inet proto udp from any to 10.0.0.1 port = domain +@16 pass out inet proto udp from any to 10.0.0.1 port = 53 [ Skip steps: i=18 r=end d=end f=end p=18 sa=end sp=end dp=18 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass out inet proto udp from any to 10.0.0.3 port = domain +@17 pass out inet proto udp from any to 10.0.0.3 port = 53 [ Skip steps: r=end d=end f=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +@18 pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA [ Skip steps: r=end d=end f=end p=end sa=end da=20 sp=end dp=20 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +@19 pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA [ Skip steps: r=end d=end f=end p=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -82,7 +82,7 @@ [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass out inet proto tcp from any to 10.0.0.1 port = www flags S/SA +@21 pass out inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf88.loaded b/regress/sbin/pfctl/pf88.loaded index 8f949abb42b..924445a8dc7 100644 --- a/regress/sbin/pfctl/pf88.loaded +++ b/regress/sbin/pfctl/pf88.loaded @@ -58,7 +58,7 @@ [ Skip steps: i=18 r=17 d=end f=16 p=16 sa=16 da=16 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 port = www flags S/SA +@15 pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 port = 80 flags S/SA [ Skip steps: i=18 r=17 d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf88.ok b/regress/sbin/pfctl/pf88.ok index 9b8997134cb..5ebcb4e304a 100644 --- a/regress/sbin/pfctl/pf88.ok +++ b/regress/sbin/pfctl/pf88.ok @@ -13,7 +13,7 @@ pass inet from any to 10.0.0.2 flags S/SA modulate state block drop inet from 10.0.0.3 to 10.0.0.2 pass inet from any to 10.0.0.2 flags S/SA synproxy state pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 flags S/SA -pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 port = www flags S/SA +pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 port = 80 flags S/SA pass out all flags S/SA pass in all flags S/SA pass in on lo1000001 all flags S/SA diff --git a/regress/sbin/pfctl/pf89.loaded b/regress/sbin/pfctl/pf89.loaded index 7f0c349fd53..68071413f04 100644 --- a/regress/sbin/pfctl/pf89.loaded +++ b/regress/sbin/pfctl/pf89.loaded @@ -18,19 +18,19 @@ [ Skip steps: d=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10, max-src-conn-rate 3/99, src.track 99) +@5 pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = 22 flags S/SA keep state (source-track rule, max-src-conn 10, max-src-conn-rate 3/99, src.track 99) [ Skip steps: i=8 r=end d=end f=end p=end sa=end sp=end dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10) +@6 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA keep state (source-track rule, max-src-conn 10) [ Skip steps: i=8 r=end d=end f=end p=end sa=end sp=end dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = ssh flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99) +@7 pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = 22 flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99) [ Skip steps: r=end d=end f=end p=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = www flags S/SA modulate state (source-track rule, max-src-conn 100, max-src-conn-rate 10/5, overload <bad> flush, src.track 5) +@8 pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA modulate state (source-track rule, max-src-conn 100, max-src-conn-rate 10/5, overload <bad> flush, src.track 5) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf89.ok b/regress/sbin/pfctl/pf89.ok index a5aa5f426eb..fdcc553abd1 100644 --- a/regress/sbin/pfctl/pf89.ok +++ b/regress/sbin/pfctl/pf89.ok @@ -4,8 +4,8 @@ block drop quick from <bad> to any pass out proto tcp all flags S/SA pass out proto icmp all pass out proto udp all -pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10, max-src-conn-rate 3/99, src.track 99) -pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10) -pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = ssh flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99) -pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = www flags S/SA modulate state (source-track rule, max-src-conn 100, max-src-conn-rate 10/5, overload <bad> flush, src.track 5) +pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = 22 flags S/SA keep state (source-track rule, max-src-conn 10, max-src-conn-rate 3/99, src.track 99) +pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA keep state (source-track rule, max-src-conn 10) +pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = 22 flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99) +pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA modulate state (source-track rule, max-src-conn 100, max-src-conn-rate 10/5, overload <bad> flush, src.track 5) pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = 8080 flags S/SA synproxy state (source-track rule, max-src-conn 1000, max-src-conn-rate 1000/5, overload <bad> flush global, src.track 5) diff --git a/regress/sbin/pfctl/pf89.optimized b/regress/sbin/pfctl/pf89.optimized index 7f0c349fd53..68071413f04 100644 --- a/regress/sbin/pfctl/pf89.optimized +++ b/regress/sbin/pfctl/pf89.optimized @@ -18,19 +18,19 @@ [ Skip steps: d=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10, max-src-conn-rate 3/99, src.track 99) +@5 pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = 22 flags S/SA keep state (source-track rule, max-src-conn 10, max-src-conn-rate 3/99, src.track 99) [ Skip steps: i=8 r=end d=end f=end p=end sa=end sp=end dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10) +@6 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA keep state (source-track rule, max-src-conn 10) [ Skip steps: i=8 r=end d=end f=end p=end sa=end sp=end dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = ssh flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99) +@7 pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = 22 flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99) [ Skip steps: r=end d=end f=end p=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = www flags S/SA modulate state (source-track rule, max-src-conn 100, max-src-conn-rate 10/5, overload <bad> flush, src.track 5) +@8 pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA modulate state (source-track rule, max-src-conn 100, max-src-conn-rate 10/5, overload <bad> flush, src.track 5) [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf97.ok b/regress/sbin/pfctl/pf97.ok index c452edf606e..52941d0b1d0 100644 --- a/regress/sbin/pfctl/pf97.ok +++ b/regress/sbin/pfctl/pf97.ok @@ -1,4 +1,4 @@ pass in on em0 inet proto tcp from any to any port 220:230 flags S/SA divert-to 127.0.0.1 port 22 pass out on em0 inet proto tcp from any to any port 220:230 flags S/SA divert-reply -pass on em0 inet proto tcp from any to any port = www flags S/SA divert-to 127.0.0.1 port 8080 +pass on em0 inet proto tcp from any to any port = 80 flags S/SA divert-to 127.0.0.1 port 8080 pass in on em0 inet proto pim all divert-to 127.0.0.1 port 103 diff --git a/regress/sbin/pfctl/pfaltq5.ok b/regress/sbin/pfctl/pfaltq5.ok index b85dd5182e2..4d8218188f1 100644 --- a/regress/sbin/pfctl/pfaltq5.ok +++ b/regress/sbin/pfctl/pfaltq5.ok @@ -4,15 +4,15 @@ queue wim on lo0 priority 15 [ qid=2 ifname=lo0 ifbandwidth=10Mb ] queue hi on lo0 priority 7 [ qid=3 ifname=lo0 ifbandwidth=10Mb ] -@0 pass in on lo0 proto tcp from any to any port = ssh flags S/SA keep state queue(hi, wim) +@0 pass in on lo0 proto tcp from any to any port = 22 flags S/SA keep state queue(hi, wim) [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=3 ] [ queue: qname=hi qid=3 pqname=wim pqid=2 ] -@1 pass in proto tcp from any to any port = ssh flags S/SA keep state queue(hi, wim) +@1 pass in proto tcp from any to any port = 22 flags S/SA keep state queue(hi, wim) [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=3 ] [ queue: qname=hi qid=3 pqname=wim pqid=2 ] -@2 pass in proto tcp from any to any port = ssh flags S/SA keep state queue wim +@2 pass in proto tcp from any to any port = 22 flags S/SA keep state queue wim [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ queue: qname=wim qid=2 pqname= pqid=2 ] -@3 pass in proto tcp from any to any port = smtp flags S/SA keep state queue praise +@3 pass in proto tcp from any to any port = 25 flags S/SA keep state queue praise [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname=praise qid=1 pqname= pqid=1 ] diff --git a/regress/sbin/pfctl/pfaltq6.ok b/regress/sbin/pfctl/pfaltq6.ok index e017820169e..64578fb8a7f 100644 --- a/regress/sbin/pfctl/pfaltq6.ok +++ b/regress/sbin/pfctl/pfaltq6.ok @@ -10,15 +10,15 @@ queue is on lo0 bandwidth 1Mb [ qid=5 ifname=lo0 ifbandwidth=10Mb ] queue empty on lo0 bandwidth 4Mb [ qid=6 ifname=lo0 ifbandwidth=10Mb ] -@0 pass in on lo0 proto tcp from any to any port = ssh flags S/SA keep state queue(the, minibar) +@0 pass in on lo0 proto tcp from any to any port = 22 flags S/SA keep state queue(the, minibar) [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=3 ] [ queue: qname=the qid=3 pqname=minibar pqid=4 ] -@1 pass in proto tcp from any to any port = ssh flags S/SA keep state queue(is, empty) +@1 pass in proto tcp from any to any port = 22 flags S/SA keep state queue(is, empty) [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=3 ] [ queue: qname=is qid=5 pqname=empty pqid=6 ] -@2 pass in proto tcp from any to any port = ssh flags S/SA keep state queue the +@2 pass in proto tcp from any to any port = 22 flags S/SA keep state queue the [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ queue: qname=the qid=3 pqname= pqid=3 ] -@3 pass in proto tcp from any to any port = smtp flags S/SA keep state queue wim +@3 pass in proto tcp from any to any port = 25 flags S/SA keep state queue wim [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname=wim qid=2 pqname= pqid=2 ] |