diff options
| -rw-r--r-- | regress/sbin/pfctl/pf33.in | 2 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf33.ok | 2 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf35.in | 2 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf35.ok | 2 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf37.in | 2 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf37.ok | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/regress/sbin/pfctl/pf33.in b/regress/sbin/pfctl/pf33.in index 50e01474ebe..1663f57441b 100644 --- a/regress/sbin/pfctl/pf33.in +++ b/regress/sbin/pfctl/pf33.in @@ -1,6 +1,6 @@ ext_if = "lo0" -altq on $ext_if scheduler cbq bandwidth 10Mb \ +altq on $ext_if cbq bandwidth 10Mb \ queue { deflt, http, ssh, mail, rsets } queue deflt bandwidth 10% priority 0 cbq(default ecn) queue http bandwidth 1.5Mb priority 3 { http_vhosts, http_cust1 } diff --git a/regress/sbin/pfctl/pf33.ok b/regress/sbin/pfctl/pf33.ok index 56bebcd1f09..862f176404e 100644 --- a/regress/sbin/pfctl/pf33.ok +++ b/regress/sbin/pfctl/pf33.ok @@ -1,5 +1,5 @@ ext_if = "lo0" -altq on lo0 scheduler cbq bandwidth 10.00Mb tbrsize 1824 queue { deflt http ssh mail rsets } +altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { deflt http ssh mail rsets } queue deflt bandwidth 1000.00Kb priority 0 cbq( red ecn default ) queue http bandwidth 1.50Mb priority 3 { http_vhosts http_cust1 } queue http_vhosts bandwidth 600.00Kb cbq( red borrow ) diff --git a/regress/sbin/pfctl/pf35.in b/regress/sbin/pfctl/pf35.in index a7d04741aa4..5a47e6227c3 100644 --- a/regress/sbin/pfctl/pf35.in +++ b/regress/sbin/pfctl/pf35.in @@ -7,7 +7,7 @@ intf = "lo0" developerhosts="10.0.0.0/24" employeehosts="10.0.1.0/24" -altq on $intf scheduler cbq(ecn) bandwidth 10Mb qlimit 100 tbrsize 5000 \ +altq on $intf cbq(ecn) bandwidth 10Mb qlimit 100 tbrsize 5000 \ queue { std, http, mail, ssh } queue std bandwidth 10% qlimit 1 cbq(default) diff --git a/regress/sbin/pfctl/pf35.ok b/regress/sbin/pfctl/pf35.ok index 9f53a5617bb..165d9a2f287 100644 --- a/regress/sbin/pfctl/pf35.ok +++ b/regress/sbin/pfctl/pf35.ok @@ -1,7 +1,7 @@ intf = "lo0" developerhosts = "10.0.0.0/24" employeehosts = "10.0.1.0/24" -altq on lo0 scheduler cbq( red ecn ) bandwidth 10.00Mb qlimit 100 tbrsize 5000 queue { std http mail ssh } +altq on lo0 cbq( red ecn ) bandwidth 10.00Mb qlimit 100 tbrsize 5000 queue { std http mail ssh } queue std bandwidth 1000.00Kb qlimit 1 cbq( default ) queue http bandwidth 6.00Mb priority 2 cbq( red borrow ) { employees developers } queue developers bandwidth 6.00Mb diff --git a/regress/sbin/pfctl/pf37.in b/regress/sbin/pfctl/pf37.in index 3fb085bbf64..60d228ac442 100644 --- a/regress/sbin/pfctl/pf37.in +++ b/regress/sbin/pfctl/pf37.in @@ -1,5 +1,5 @@ #test altq with interface expansion #also tests multiple queues with the same name but on different interfaces -altq on { lo0 lo1 } scheduler cbq bandwidth 10Mb queue std +altq on { lo0 lo1 } cbq bandwidth 10Mb queue std queue std cbq(default) diff --git a/regress/sbin/pfctl/pf37.ok b/regress/sbin/pfctl/pf37.ok index 5392085d1ce..a8684e3a2f0 100644 --- a/regress/sbin/pfctl/pf37.ok +++ b/regress/sbin/pfctl/pf37.ok @@ -1,3 +1,3 @@ -altq on lo0 scheduler cbq bandwidth 10.00Mb tbrsize 1824 queue { std } -altq on lo1 scheduler cbq bandwidth 10.00Mb tbrsize 1824 queue { std } +altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { std } +altq on lo1 cbq bandwidth 10.00Mb tbrsize 1824 queue { std } queue std bandwidth 10.00Mb cbq( default ) |