diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2013-08-01 19:28:37 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2013-08-01 19:28:37 +0000 |
| commit | 99e4bd039f12d6ae201fafcb4e6d632519ce2027 (patch) | |
| tree | 6ff2d2e70a08ea6ba09cee361f2b9fac480260ad | |
| parent | d2a064fa26e43cea96ee73b50385e19fe0bbdeab (diff) | |
more set queue fallout fixups
| -rw-r--r-- | regress/sbin/pfctl/pf15.loaded | 10 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf39.loaded | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded index ec3709ec955..23913942803 100644 --- a/regress/sbin/pfctl/pf15.loaded +++ b/regress/sbin/pfctl/pf15.loaded @@ -14,23 +14,23 @@ [ Skip steps: i=end d=5 r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 match all scrub (set-tos 0x10) +@4 match all set ( tos 0x10 ) [ Skip steps: i=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 match out proto esp all scrub (set-tos 0x08) +@5 match out proto esp all set ( tos 0x08 ) [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 match out proto ah all scrub (set-tos 0x04) +@6 match out proto ah all set ( tos 0x04 ) [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 match out proto icmp all scrub (set-tos 0x12) +@7 match out proto icmp all set ( tos 0x12 ) [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 match out all scrub (set-tos 0x08) tagged THROUGHPUT +@8 match out all set ( tos 0x08 ) tagged THROUGHPUT [ Skip steps: i=end d=end r=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/pf39.loaded b/regress/sbin/pfctl/pf39.loaded index b0b2b5382ce..a83bf064b75 100644 --- a/regress/sbin/pfctl/pf39.loaded +++ b/regress/sbin/pfctl/pf39.loaded @@ -2,23 +2,23 @@ [ Skip steps: i=end d=end r=end f=end p=5 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 log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 allow-opts label "blah" queue blah +@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 allow-opts label "blah" queue blah +@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 allow-opts label "blah" queue blah +@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 allow-opts label "blah" queue blah +@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah" [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 label "blah" queue blah +@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( queue blah ) label "blah" [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -26,7 +26,7 @@ [ Skip steps: i=end d=end r=end f=end p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 label "blah" queue blah +@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( queue blah ) label "blah" [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] |