diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-10-20 08:41:20 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2012-10-20 08:41:20 +0000 |
| commit | 83368933c0e13385e80f97efe7adc16f5bbce3de (patch) | |
| tree | 9c77555643706de6799dfe4dd27e9751f29d257e /regress/sbin | |
| parent | 39e64174193c68de29efedb9eac855f6beda273f (diff) | |
pf.conf "prio" syntax was changed (2012/07/09); adapt pfctl regress tests.
ok henning@
prio X -> set prio X
prio (X Y) -> set prio (X Y)
Diffstat (limited to 'regress/sbin')
| -rw-r--r-- | regress/sbin/pfctl/pf101.in | 6 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf101.ok | 8 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf101.optimized | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/regress/sbin/pfctl/pf101.in b/regress/sbin/pfctl/pf101.in index d9a9c0b3b2d..8bf9dc6cb8d 100644 --- a/regress/sbin/pfctl/pf101.in +++ b/regress/sbin/pfctl/pf101.in @@ -1,8 +1,8 @@ # test prio -pass prio 3 +pass set prio 3 -pass out on lo1000000 proto tcp from any to any port 22 prio (5 2) +pass out on lo1000000 proto tcp from any to any port 22 set prio (5 2) -pass proto udp from any to { 127.0.0.1 127.0.0.2 } port 53 prio 4 +pass proto udp from any to { 127.0.0.1 127.0.0.2 } port 53 set prio 4 diff --git a/regress/sbin/pfctl/pf101.ok b/regress/sbin/pfctl/pf101.ok index df7bc25eac4..4c5b7f0f2a7 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 = 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 +pass all flags S/SA set ( prio 3 ) +pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA set ( prio(5, 2) ) +pass inet proto udp from any to 127.0.0.1 port = 53 set ( prio 4 ) +pass inet proto udp from any to 127.0.0.2 port = 53 set ( prio 4 ) diff --git a/regress/sbin/pfctl/pf101.optimized b/regress/sbin/pfctl/pf101.optimized index 3fc68e3567b..01b9492dcfd 100644 --- a/regress/sbin/pfctl/pf101.optimized +++ b/regress/sbin/pfctl/pf101.optimized @@ -1,16 +1,16 @@ -@0 pass all flags S/SA prio 3 +@0 pass all flags S/SA set ( prio 3 ) [ Skip steps: r=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 = 22 flags S/SA prio(5, 2) +@1 pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA set ( prio(5, 2) ) [ Skip steps: r=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 = 53 prio 4 +@2 pass inet proto udp from any to 127.0.0.1 port = 53 set ( prio 4 ) [ Skip steps: i=end d=end r=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 = 53 prio 4 +@3 pass inet proto udp from any to 127.0.0.2 port = 53 set ( prio 4 ) [ 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 ] |