summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2012-10-19 16:04:56 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2012-10-19 16:04:56 +0000
commit533ab861931418af72a197d0f54b609fd572661f (patch)
treefb917af655bc7ea463bd76669466bf987bd79cc8 /regress
parent84ae5359af48359f0b7e0247e7fe77ac4e5fe291 (diff)
scrub(set-tos XX) is deprecated, the preferred form (and thus display
output) is set(tos XX). sync regression tests accordingly. henning@ ok.
Diffstat (limited to 'regress')
-rw-r--r--regress/sbin/pfctl/pf15.ok10
-rw-r--r--regress/sbin/pfctl/pf15.optimized4
2 files changed, 7 insertions, 7 deletions
diff --git a/regress/sbin/pfctl/pf15.ok b/regress/sbin/pfctl/pf15.ok
index 24776aad28a..eae3df356f7 100644
--- a/regress/sbin/pfctl/pf15.ok
+++ b/regress/sbin/pfctl/pf15.ok
@@ -4,8 +4,8 @@ match all scrub (no-df)
match all scrub (min-ttl 25)
match all scrub (max-mss 224)
match all scrub (no-df max-mss 224)
-match all scrub (set-tos 0x10)
-match out proto esp all scrub (set-tos 0x08)
-match out proto ah all scrub (set-tos 0x04)
-match out proto icmp all scrub (set-tos 0x12)
-match out all scrub (set-tos 0x08) tagged THROUGHPUT
+match all set ( tos 0x10 )
+match out proto esp all set ( tos 0x08 )
+match out proto ah all set ( tos 0x04 )
+match out proto icmp all set ( tos 0x12 )
+match out all set ( tos 0x08 ) tagged THROUGHPUT
diff --git a/regress/sbin/pfctl/pf15.optimized b/regress/sbin/pfctl/pf15.optimized
index 09993b42d79..7a6eade15f8 100644
--- a/regress/sbin/pfctl/pf15.optimized
+++ b/regress/sbin/pfctl/pf15.optimized
@@ -10,11 +10,11 @@
[ Skip steps: i=end d=4 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 ]
-@3 match all scrub (set-tos 0x10)
+@3 match all set ( tos 0x10 )
[ Skip steps: i=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 ]
-@4 match out all scrub (set-tos 0x08) tagged THROUGHPUT
+@4 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 ]