diff options
Diffstat (limited to 'regress/sbin')
-rw-r--r-- | regress/sbin/pfctl/pf48.in | 2 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf48.loaded | 16 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf48.ok | 2 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf48.optimized | 16 |
4 files changed, 18 insertions, 18 deletions
diff --git a/regress/sbin/pfctl/pf48.in b/regress/sbin/pfctl/pf48.in index 5b0f868a904..f6014eef072 100644 --- a/regress/sbin/pfctl/pf48.in +++ b/regress/sbin/pfctl/pf48.in @@ -1,5 +1,5 @@ table < regress > { 1.2.3.4 !5.6.7.8 10/8 lo0 } -table <regress.1> const { ::1 fe80::/64 localhost } +table <regress.1> const { ::1 fe80::/64 } table <regress.a> { 1.2.3.4 !5.6.7.8 } { ::1 ::2 ::3 } file "/dev/null" const { 4.3.2.1 } scrub in from { <regress.1> !<regress.2> } to any scrub out from any to { !<regress.1>, <regress.2> } diff --git a/regress/sbin/pfctl/pf48.loaded b/regress/sbin/pfctl/pf48.loaded index d8f13e17e68..31b0712d596 100644 --- a/regress/sbin/pfctl/pf48.loaded +++ b/regress/sbin/pfctl/pf48.loaded @@ -1,20 +1,20 @@ -@0 nat on lo0 inet from <regress.1:3> to <regress.2:*> -> 127.0.0.1 +@0 nat on lo0 inet from <regress.1:2> to <regress.2:*> -> 127.0.0.1 [ Skip steps: d=end f=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 nat on ! lo0 inet from ! <regress.1:3> to <regress.2:*> -> 127.0.0.1 +@1 nat on ! lo0 inet from ! <regress.1:2> to <regress.2:*> -> 127.0.0.1 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 rdr on lo0 inet from <regress.1:3> to <regress.2:*> -> 127.0.0.1 +@0 rdr on lo0 inet from <regress.1:2> to <regress.2:*> -> 127.0.0.1 [ Skip steps: d=end f=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 rdr on ! lo0 inet from ! <regress.1:3> to <regress.2:*> -> 127.0.0.1 +@1 rdr on ! lo0 inet from ! <regress.1:2> to <regress.2:*> -> 127.0.0.1 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 scrub in from <regress.1:3> to any fragment reassemble +@0 scrub in from <regress.1:2> to any fragment reassemble [ Skip steps: i=end d=2 f=end p=end sp=end da=2 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -22,7 +22,7 @@ [ Skip steps: i=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 scrub out from any to ! <regress.1:3> fragment reassemble +@2 scrub out from any to ! <regress.1:2> fragment reassemble [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -38,7 +38,7 @@ [ Skip steps: i=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in from <regress.1:3> to any flags S/SA keep state +@2 pass in from <regress.1:2> to any flags S/SA keep state [ Skip steps: i=end d=4 f=end p=end sp=end da=4 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -46,7 +46,7 @@ [ Skip steps: i=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out from any to ! <regress.1:3> flags S/SA keep state +@4 pass out from any to ! <regress.1:2> flags S/SA keep state [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf48.ok b/regress/sbin/pfctl/pf48.ok index 3292087b8bc..e38f19bc2a3 100644 --- a/regress/sbin/pfctl/pf48.ok +++ b/regress/sbin/pfctl/pf48.ok @@ -1,5 +1,5 @@ table <regress> { 1.2.3.4 !5.6.7.8 10.0.0.0/8 127.0.0.1 ::1 fe80::1 } -table <regress.1> const { ::1 fe80::/64 ::1 127.0.0.1 } +table <regress.1> const { ::1 fe80::/64 } table <regress.a> const { 1.2.3.4 !5.6.7.8 ::1 ::2 ::3 } file "/dev/null" { 4.3.2.1 } scrub in from <regress.1> to any fragment reassemble scrub in from ! <regress.2> to any fragment reassemble diff --git a/regress/sbin/pfctl/pf48.optimized b/regress/sbin/pfctl/pf48.optimized index eb5416257c6..f944edb5331 100644 --- a/regress/sbin/pfctl/pf48.optimized +++ b/regress/sbin/pfctl/pf48.optimized @@ -1,20 +1,20 @@ -@0 nat on lo0 inet from <regress.1:3> to <regress.2:*> -> 127.0.0.1 +@0 nat on lo0 inet from <regress.1:2> to <regress.2:*> -> 127.0.0.1 [ Skip steps: d=end f=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 nat on ! lo0 inet from ! <regress.1:3> to <regress.2:*> -> 127.0.0.1 +@1 nat on ! lo0 inet from ! <regress.1:2> to <regress.2:*> -> 127.0.0.1 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 rdr on lo0 inet from <regress.1:3> to <regress.2:*> -> 127.0.0.1 +@0 rdr on lo0 inet from <regress.1:2> to <regress.2:*> -> 127.0.0.1 [ Skip steps: d=end f=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 rdr on ! lo0 inet from ! <regress.1:3> to <regress.2:*> -> 127.0.0.1 +@1 rdr on ! lo0 inet from ! <regress.1:2> to <regress.2:*> -> 127.0.0.1 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 scrub in from <regress.1:3> to any fragment reassemble +@0 scrub in from <regress.1:2> to any fragment reassemble [ Skip steps: i=end d=2 f=end p=end sp=end da=2 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -22,7 +22,7 @@ [ Skip steps: i=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 scrub out from any to ! <regress.1:3> fragment reassemble +@2 scrub out from any to ! <regress.1:2> fragment reassemble [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -34,7 +34,7 @@ [ Skip steps: i=end d=3 f=end p=end sp=end da=3 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in from <regress.1:3> to any flags S/SA keep state +@1 pass in from <regress.1:2> to any flags S/SA keep state [ Skip steps: i=end d=3 f=end p=end sp=end da=3 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -46,7 +46,7 @@ [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out from any to ! <regress.1:3> flags S/SA keep state +@4 pass out from any to ! <regress.1:2> flags S/SA keep state [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] |