From 9fddda297b76b8b4407e7cbc8152ac5a7a448384 Mon Sep 17 00:00:00 2001 From: Marco Pfatschbacher Date: Wed, 19 Sep 2007 12:52:49 +0000 Subject: Adopt 14 altq tests to the change of the queue output format. OK henning --- regress/sbin/pfctl/pfaltq1.ok | 8 ++++---- regress/sbin/pfctl/pfaltq10.ok | 20 ++++++++++---------- regress/sbin/pfctl/pfaltq11.ok | 28 ++++++++++++++-------------- regress/sbin/pfctl/pfaltq12.ok | 8 ++++---- regress/sbin/pfctl/pfaltq13.ok | 8 ++++---- regress/sbin/pfctl/pfaltq14.ok | 4 ++-- regress/sbin/pfctl/pfaltq2.ok | 20 ++++++++++---------- regress/sbin/pfctl/pfaltq3.ok | 28 ++++++++++++++-------------- regress/sbin/pfctl/pfaltq4.ok | 12 ++++++------ regress/sbin/pfctl/pfaltq5.ok | 14 +++++++------- regress/sbin/pfctl/pfaltq6.ok | 20 ++++++++++---------- regress/sbin/pfctl/pfaltq7.ok | 4 ++-- regress/sbin/pfctl/pfaltq8.ok | 8 ++++---- regress/sbin/pfctl/pfaltq9.ok | 8 ++++---- 14 files changed, 95 insertions(+), 95 deletions(-) (limited to 'regress/sbin') diff --git a/regress/sbin/pfctl/pfaltq1.ok b/regress/sbin/pfctl/pfaltq1.ok index 7971fee5ab6..97d187b96c1 100644 --- a/regress/sbin/pfctl/pfaltq1.ok +++ b/regress/sbin/pfctl/pfaltq1.ok @@ -1,8 +1,8 @@ -queue one priq( default ) +queue one on lo0 priq( default ) [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue one priq( default ) +queue one on tun1000000 priq( default ) [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ] -queue two priority 15 +queue two on lo0 priority 15 [ qid=2 ifname=lo0 ifbandwidth=10Mb ] -queue two priority 15 +queue two on tun1000000 priority 15 [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq10.ok b/regress/sbin/pfctl/pfaltq10.ok index 50c2dc57538..06281e0cba4 100644 --- a/regress/sbin/pfctl/pfaltq10.ok +++ b/regress/sbin/pfctl/pfaltq10.ok @@ -1,20 +1,20 @@ -queue root_lo0 bandwidth 10Mb priority 0 {one, two} +queue root_lo0 on lo0 bandwidth 10Mb priority 0 {one, two} [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue one bandwidth 1Mb hfsc( default ) +queue one on lo0 bandwidth 1Mb hfsc( default ) [ qid=3 ifname=lo0 ifbandwidth=10Mb ] -queue two bandwidth 9Mb {three, four} +queue two on lo0 bandwidth 9Mb {three, four} [ qid=4 ifname=lo0 ifbandwidth=10Mb ] -queue three bandwidth 4.50Mb +queue three on lo0 bandwidth 4.50Mb [ qid=5 ifname=lo0 ifbandwidth=10Mb ] -queue four bandwidth 3.60Mb +queue four on lo0 bandwidth 3.60Mb [ qid=6 ifname=lo0 ifbandwidth=10Mb ] -queue root_tun1000000 bandwidth 10Mb priority 0 {one, two} +queue root_tun1000000 on tun1000000 bandwidth 10Mb priority 0 {one, two} [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] -queue one bandwidth 1Mb hfsc( default ) +queue one on tun1000000 bandwidth 1Mb hfsc( default ) [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ] -queue two bandwidth 9Mb {three, four} +queue two on tun1000000 bandwidth 9Mb {three, four} [ qid=4 ifname=tun1000000 ifbandwidth=10Mb ] -queue three bandwidth 4.50Mb +queue three on tun1000000 bandwidth 4.50Mb [ qid=5 ifname=tun1000000 ifbandwidth=10Mb ] -queue four bandwidth 3.60Mb +queue four on tun1000000 bandwidth 3.60Mb [ qid=6 ifname=tun1000000 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq11.ok b/regress/sbin/pfctl/pfaltq11.ok index 0a275b56ce2..a133ca7e624 100644 --- a/regress/sbin/pfctl/pfaltq11.ok +++ b/regress/sbin/pfctl/pfaltq11.ok @@ -1,28 +1,28 @@ -queue root_lo0 bandwidth 10Mb priority 0 {eins, zwei, drei} +queue root_lo0 on lo0 bandwidth 10Mb priority 0 {eins, zwei, drei} [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue eins bandwidth 1Mb hfsc( default ) +queue eins on lo0 bandwidth 1Mb hfsc( default ) [ qid=3 ifname=lo0 ifbandwidth=10Mb ] -queue zwei bandwidth 8Mb {sub2, sub3} +queue zwei on lo0 bandwidth 8Mb {sub2, sub3} [ qid=4 ifname=lo0 ifbandwidth=10Mb ] -queue sub2 bandwidth 4Mb +queue sub2 on lo0 bandwidth 4Mb [ qid=5 ifname=lo0 ifbandwidth=10Mb ] -queue sub3 bandwidth 4Mb +queue sub3 on lo0 bandwidth 4Mb [ qid=6 ifname=lo0 ifbandwidth=10Mb ] -queue drei bandwidth 1Mb {subseven} +queue drei on lo0 bandwidth 1Mb {subseven} [ qid=7 ifname=lo0 ifbandwidth=10Mb ] -queue subseven bandwidth 900Kb +queue subseven on lo0 bandwidth 900Kb [ qid=10 ifname=lo0 ifbandwidth=10Mb ] -queue root_tun1000000 bandwidth 33.60Kb priority 0 {zwei, vier, fuenf} +queue root_tun1000000 on tun1000000 bandwidth 33.60Kb priority 0 {zwei, vier, fuenf} [ qid=2 ifname=tun1000000 ifbandwidth=33.60Kb ] -queue zwei bandwidth 26.88Kb {sub2, sub3} +queue zwei on tun1000000 bandwidth 26.88Kb {sub2, sub3} [ qid=4 ifname=tun1000000 ifbandwidth=33.60Kb ] -queue sub2 bandwidth 13.40Kb +queue sub2 on tun1000000 bandwidth 13.40Kb [ qid=5 ifname=tun1000000 ifbandwidth=33.60Kb ] -queue sub3 bandwidth 13.40Kb +queue sub3 on tun1000000 bandwidth 13.40Kb [ qid=6 ifname=tun1000000 ifbandwidth=33.60Kb ] -queue vier bandwidth 3.36Kb hfsc( default ) +queue vier on tun1000000 bandwidth 3.36Kb hfsc( default ) [ qid=8 ifname=tun1000000 ifbandwidth=33.60Kb ] -queue fuenf bandwidth 1.68Kb {subseven} +queue fuenf on tun1000000 bandwidth 1.68Kb {subseven} [ qid=9 ifname=tun1000000 ifbandwidth=33.60Kb ] -queue subseven bandwidth 1.44Kb +queue subseven on tun1000000 bandwidth 1.44Kb [ qid=10 ifname=tun1000000 ifbandwidth=33.60Kb ] diff --git a/regress/sbin/pfctl/pfaltq12.ok b/regress/sbin/pfctl/pfaltq12.ok index 049b93c0990..1c738de0638 100644 --- a/regress/sbin/pfctl/pfaltq12.ok +++ b/regress/sbin/pfctl/pfaltq12.ok @@ -1,8 +1,8 @@ -queue root_lo0 bandwidth 10Mb priority 0 {eins, zwei, drei} +queue root_lo0 on lo0 bandwidth 10Mb priority 0 {eins, zwei, drei} [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue eins bandwidth 1Mb hfsc( default linkshare(2Mb 20 500Kb) ) +queue eins on lo0 bandwidth 1Mb hfsc( default linkshare(2Mb 20 500Kb) ) [ qid=2 ifname=lo0 ifbandwidth=10Mb ] -queue zwei bandwidth 4Mb hfsc( linkshare 3.50Mb upperlimit 5Mb ) +queue zwei on lo0 bandwidth 4Mb hfsc( linkshare 3.50Mb upperlimit 5Mb ) [ qid=3 ifname=lo0 ifbandwidth=10Mb ] -queue drei bandwidth 5Mb hfsc( linkshare(4.50Mb 20 4Mb) upperlimit(6.50Mb 10 4.50Mb) ) +queue drei on lo0 bandwidth 5Mb hfsc( linkshare(4.50Mb 20 4Mb) upperlimit(6.50Mb 10 4.50Mb) ) [ qid=4 ifname=lo0 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq13.ok b/regress/sbin/pfctl/pfaltq13.ok index a8d402d691b..f09664da547 100644 --- a/regress/sbin/pfctl/pfaltq13.ok +++ b/regress/sbin/pfctl/pfaltq13.ok @@ -1,8 +1,8 @@ -queue root_lo0 bandwidth 10Mb priority 0 {eins, zwei, drei} +queue root_lo0 on lo0 bandwidth 10Mb priority 0 {eins, zwei, drei} [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue eins bandwidth 1Mb hfsc( default realtime(2Mb 20 500Kb) ) +queue eins on lo0 bandwidth 1Mb hfsc( default realtime(2Mb 20 500Kb) ) [ qid=2 ifname=lo0 ifbandwidth=10Mb ] -queue zwei bandwidth 4Mb hfsc( realtime 500Kb linkshare 3.50Mb ) +queue zwei on lo0 bandwidth 4Mb hfsc( realtime 500Kb linkshare 3.50Mb ) [ qid=3 ifname=lo0 ifbandwidth=10Mb ] -queue drei bandwidth 5Mb hfsc( realtime(5.50Mb 20 4Mb) upperlimit(6.50Mb 10 4.50Mb) ) +queue drei on lo0 bandwidth 5Mb hfsc( realtime(5.50Mb 20 4Mb) upperlimit(6.50Mb 10 4.50Mb) ) [ qid=4 ifname=lo0 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq14.ok b/regress/sbin/pfctl/pfaltq14.ok index 66527f6a5dd..72d1200ce36 100644 --- a/regress/sbin/pfctl/pfaltq14.ok +++ b/regress/sbin/pfctl/pfaltq14.ok @@ -1,4 +1,4 @@ -queue root_lo0 bandwidth 10Mb priority 0 {eins} +queue root_lo0 on lo0 bandwidth 10Mb priority 0 {eins} [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue eins bandwidth 1Mb hfsc( default linkshare(1.50Mb 20 1Mb) ) +queue eins on lo0 bandwidth 1Mb hfsc( default linkshare(1.50Mb 20 1Mb) ) [ qid=2 ifname=lo0 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq2.ok b/regress/sbin/pfctl/pfaltq2.ok index ccdcbf5e2bf..bd34077347d 100644 --- a/regress/sbin/pfctl/pfaltq2.ok +++ b/regress/sbin/pfctl/pfaltq2.ok @@ -1,20 +1,20 @@ -queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two} +queue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two} [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue one bandwidth 1Mb cbq( default ) +queue one on lo0 bandwidth 1Mb cbq( default ) [ qid=3 ifname=lo0 ifbandwidth=10Mb ] -queue two bandwidth 9Mb {three, four} +queue two on lo0 bandwidth 9Mb {three, four} [ qid=4 ifname=lo0 ifbandwidth=10Mb ] -queue three bandwidth 4.50Mb +queue three on lo0 bandwidth 4.50Mb [ qid=5 ifname=lo0 ifbandwidth=10Mb ] -queue four bandwidth 3.60Mb +queue four on lo0 bandwidth 3.60Mb [ qid=6 ifname=lo0 ifbandwidth=10Mb ] -queue root_tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two} +queue root_tun1000000 on tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two} [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] -queue one bandwidth 1Mb cbq( default ) +queue one on tun1000000 bandwidth 1Mb cbq( default ) [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ] -queue two bandwidth 9Mb {three, four} +queue two on tun1000000 bandwidth 9Mb {three, four} [ qid=4 ifname=tun1000000 ifbandwidth=10Mb ] -queue three bandwidth 4.50Mb +queue three on tun1000000 bandwidth 4.50Mb [ qid=5 ifname=tun1000000 ifbandwidth=10Mb ] -queue four bandwidth 3.60Mb +queue four on tun1000000 bandwidth 3.60Mb [ qid=6 ifname=tun1000000 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq3.ok b/regress/sbin/pfctl/pfaltq3.ok index b8134080bb7..5733c0e7dff 100644 --- a/regress/sbin/pfctl/pfaltq3.ok +++ b/regress/sbin/pfctl/pfaltq3.ok @@ -1,28 +1,28 @@ -queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {eins, zwei, drei} +queue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {eins, zwei, drei} [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue eins bandwidth 1Mb cbq( default ) +queue eins on lo0 bandwidth 1Mb cbq( default ) [ qid=3 ifname=lo0 ifbandwidth=10Mb ] -queue zwei bandwidth 6Mb {sub2, sub3} +queue zwei on lo0 bandwidth 6Mb {sub2, sub3} [ qid=4 ifname=lo0 ifbandwidth=10Mb ] -queue sub2 bandwidth 3Mb +queue sub2 on lo0 bandwidth 3Mb [ qid=5 ifname=lo0 ifbandwidth=10Mb ] -queue sub3 bandwidth 3Mb +queue sub3 on lo0 bandwidth 3Mb [ qid=6 ifname=lo0 ifbandwidth=10Mb ] -queue drei bandwidth 3Mb {subseven} +queue drei on lo0 bandwidth 3Mb {subseven} [ qid=7 ifname=lo0 ifbandwidth=10Mb ] -queue subseven bandwidth 2.70Mb +queue subseven on lo0 bandwidth 2.70Mb [ qid=10 ifname=lo0 ifbandwidth=10Mb ] -queue root_tun1000000 bandwidth 128Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf} +queue root_tun1000000 on tun1000000 bandwidth 128Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf} [ qid=2 ifname=tun1000000 ifbandwidth=128Kb ] -queue zwei bandwidth 76.80Kb {sub2, sub3} +queue zwei on tun1000000 bandwidth 76.80Kb {sub2, sub3} [ qid=4 ifname=tun1000000 ifbandwidth=128Kb ] -queue sub2 bandwidth 38.40Kb +queue sub2 on tun1000000 bandwidth 38.40Kb [ qid=5 ifname=tun1000000 ifbandwidth=128Kb ] -queue sub3 bandwidth 38.40Kb +queue sub3 on tun1000000 bandwidth 38.40Kb [ qid=6 ifname=tun1000000 ifbandwidth=128Kb ] -queue vier bandwidth 32Kb cbq( default ) +queue vier on tun1000000 bandwidth 32Kb cbq( default ) [ qid=8 ifname=tun1000000 ifbandwidth=128Kb ] -queue fuenf bandwidth 19.20Kb {subseven} +queue fuenf on tun1000000 bandwidth 19.20Kb {subseven} [ qid=9 ifname=tun1000000 ifbandwidth=128Kb ] -queue subseven bandwidth 17.28Kb +queue subseven on tun1000000 bandwidth 17.28Kb [ qid=10 ifname=tun1000000 ifbandwidth=128Kb ] diff --git a/regress/sbin/pfctl/pfaltq4.ok b/regress/sbin/pfctl/pfaltq4.ok index ae9b27e915e..99ea8142c7d 100644 --- a/regress/sbin/pfctl/pfaltq4.ok +++ b/regress/sbin/pfctl/pfaltq4.ok @@ -1,12 +1,12 @@ -queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, germans} +queue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, germans} [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue bloody bandwidth 5Mb cbq( default ) +queue bloody on lo0 bandwidth 5Mb cbq( default ) [ qid=3 ifname=lo0 ifbandwidth=10Mb ] -queue germans bandwidth 5Mb +queue germans on lo0 bandwidth 5Mb [ qid=4 ifname=lo0 ifbandwidth=10Mb ] -queue root_tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, toads} +queue root_tun1000000 on tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, toads} [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] -queue bloody bandwidth 5Mb cbq( default ) +queue bloody on tun1000000 bandwidth 5Mb cbq( default ) [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ] -queue toads bandwidth 5Mb +queue toads on tun1000000 bandwidth 5Mb [ qid=5 ifname=tun1000000 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq5.ok b/regress/sbin/pfctl/pfaltq5.ok index 052756c3e9e..b85dd5182e2 100644 --- a/regress/sbin/pfctl/pfaltq5.ok +++ b/regress/sbin/pfctl/pfaltq5.ok @@ -1,18 +1,18 @@ -queue praise priq( default ) +queue praise on lo0 priq( default ) [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue wim priority 15 +queue wim on lo0 priority 15 [ qid=2 ifname=lo0 ifbandwidth=10Mb ] -queue hi priority 7 +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 keep state queue(hi, wim) +@0 pass in on lo0 proto tcp from any to any port = ssh 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 keep state queue(hi, wim) +@1 pass in proto tcp from any to any port = ssh 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 keep state queue wim +@2 pass in proto tcp from any to any port = ssh 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 keep state queue praise +@3 pass in proto tcp from any to any port = smtp 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 3e4e4514f43..e017820169e 100644 --- a/regress/sbin/pfctl/pfaltq6.ok +++ b/regress/sbin/pfctl/pfaltq6.ok @@ -1,24 +1,24 @@ -queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {wim, the, minibar, is, empty} +queue root_lo0 on lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {wim, the, minibar, is, empty} [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue wim bandwidth 1Mb cbq( default ) +queue wim on lo0 bandwidth 1Mb cbq( default ) [ qid=2 ifname=lo0 ifbandwidth=10Mb ] -queue the bandwidth 1Mb +queue the on lo0 bandwidth 1Mb [ qid=3 ifname=lo0 ifbandwidth=10Mb ] -queue minibar bandwidth 3Mb priority 7 +queue minibar on lo0 bandwidth 3Mb priority 7 [ qid=4 ifname=lo0 ifbandwidth=10Mb ] -queue is bandwidth 1Mb +queue is on lo0 bandwidth 1Mb [ qid=5 ifname=lo0 ifbandwidth=10Mb ] -queue empty bandwidth 4Mb +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 keep state queue(the, minibar) +@0 pass in on lo0 proto tcp from any to any port = ssh 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 keep state queue(is, empty) +@1 pass in proto tcp from any to any port = ssh 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 keep state queue the +@2 pass in proto tcp from any to any port = ssh 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 keep state queue wim +@3 pass in proto tcp from any to any port = smtp 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 ] diff --git a/regress/sbin/pfctl/pfaltq7.ok b/regress/sbin/pfctl/pfaltq7.ok index 110e2a1cb2b..7bf2c741f71 100644 --- a/regress/sbin/pfctl/pfaltq7.ok +++ b/regress/sbin/pfctl/pfaltq7.ok @@ -1,4 +1,4 @@ -queue eins priority 2 priq( default ) +queue eins on lo0 priority 2 priq( default ) [ qid=1 ifname=lo0 ifbandwidth=10Mb ] -queue zwei priority 2 priq( default ) +queue zwei on tun1000000 priority 2 priq( default ) [ qid=2 ifname=tun1000000 ifbandwidth=33.60Kb ] diff --git a/regress/sbin/pfctl/pfaltq8.ok b/regress/sbin/pfctl/pfaltq8.ok index 80dd7830602..808bfb317b5 100644 --- a/regress/sbin/pfctl/pfaltq8.ok +++ b/regress/sbin/pfctl/pfaltq8.ok @@ -1,8 +1,8 @@ -queue one priq( default ) +queue one on tun1000000 priq( default ) [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ] -queue one priq( default ) +queue one on tun1000001 priq( default ) [ qid=1 ifname=tun1000001 ifbandwidth=10Mb ] -queue two priority 15 +queue two on tun1000000 priority 15 [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] -queue two priority 0 +queue two on tun1000001 priority 0 [ qid=2 ifname=tun1000001 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq9.ok b/regress/sbin/pfctl/pfaltq9.ok index 80dd7830602..808bfb317b5 100644 --- a/regress/sbin/pfctl/pfaltq9.ok +++ b/regress/sbin/pfctl/pfaltq9.ok @@ -1,8 +1,8 @@ -queue one priq( default ) +queue one on tun1000000 priq( default ) [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ] -queue one priq( default ) +queue one on tun1000001 priq( default ) [ qid=1 ifname=tun1000001 ifbandwidth=10Mb ] -queue two priority 15 +queue two on tun1000000 priority 15 [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ] -queue two priority 0 +queue two on tun1000001 priority 0 [ qid=2 ifname=tun1000001 ifbandwidth=10Mb ] -- cgit v1.2.3