diff options
| -rw-r--r-- | regress/sbin/pfctl/pf35.in | 8 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf35.ok | 8 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf43.in | 4 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf43.ok | 4 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf58.in | 4 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf58.ok | 4 |
6 files changed, 16 insertions, 16 deletions
diff --git a/regress/sbin/pfctl/pf35.in b/regress/sbin/pfctl/pf35.in index 5a47e6227c3..de12cfcd2c7 100644 --- a/regress/sbin/pfctl/pf35.in +++ b/regress/sbin/pfctl/pf35.in @@ -12,12 +12,12 @@ altq on $intf cbq(ecn) bandwidth 10Mb qlimit 100 tbrsize 5000 \ queue std bandwidth 10% qlimit 1 cbq(default) queue http bandwidth 60% priority 2 cbq(borrow red) { employees, developers } -queue developers -queue employees bandwidth 10% +queue developers bandwidth 60% +queue employees bandwidth 40% queue mail bandwidth 10% priority 0 cbq(borrow ecn) queue ssh bandwidth 20% cbq(borrow) { ssh_interactive, ssh_bulk } -queue ssh_interactive priority 7 -queue ssh_bulk priority 0 qlimit 60 +queue ssh_interactive priority 7 bandwidth 30% +queue ssh_bulk priority 0 qlimit 60 bandwidth 70% block return out on $intf inet all queue std pass out on $intf inet proto tcp from $developerhosts to any port 80 keep state \ diff --git a/regress/sbin/pfctl/pf35.ok b/regress/sbin/pfctl/pf35.ok index 7a995a6441a..ea5ca116b52 100644 --- a/regress/sbin/pfctl/pf35.ok +++ b/regress/sbin/pfctl/pf35.ok @@ -4,12 +4,12 @@ employeehosts = "10.0.1.0/24" altq on lo0 cbq( red ecn ) bandwidth 10Mb qlimit 100 tbrsize 5000 queue { std http mail ssh } queue std bandwidth 10% qlimit 1 cbq( default ) queue http bandwidth 60% priority 2 cbq( red borrow ) { employees developers } -queue developers -queue employees bandwidth 10% +queue developers bandwidth 60% +queue employees bandwidth 40% queue mail bandwidth 10% priority 0 cbq( red ecn borrow ) queue ssh bandwidth 20% cbq( borrow ) { ssh_interactive ssh_bulk } -queue ssh_interactive priority 7 -queue ssh_bulk priority 0 qlimit 60 +queue ssh_interactive bandwidth 30% priority 7 +queue ssh_bulk bandwidth 70% priority 0 qlimit 60 block return out on lo0 inet all queue std pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = www keep state queue developers pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = www keep state queue employees diff --git a/regress/sbin/pfctl/pf43.in b/regress/sbin/pfctl/pf43.in index 4cccca06001..bb144b0f7de 100644 --- a/regress/sbin/pfctl/pf43.in +++ b/regress/sbin/pfctl/pf43.in @@ -1,8 +1,8 @@ #test various forms of queue assignment altq on lo0 tbrsize 3648 bandwidth 100Mb cbq queue { bulk, prio } -queue bulk priority 1 cbq(default) -queue prio priority 7 +queue bulk priority 1 cbq(default) bandwidth 70% +queue prio priority 7 bandwidth 30% pass in on lo0 inet proto tcp from any to lo0 port 22 queue (bulk prio) pass in on lo0 inet proto tcp from any to lo0 port 22 queue bulk pass in on lo0 inet proto tcp from any to lo0 port 22 queue (bulk, prio) diff --git a/regress/sbin/pfctl/pf43.ok b/regress/sbin/pfctl/pf43.ok index 05fbda3cf58..67d1c28f4ed 100644 --- a/regress/sbin/pfctl/pf43.ok +++ b/regress/sbin/pfctl/pf43.ok @@ -1,6 +1,6 @@ altq on lo0 cbq bandwidth 100Mb tbrsize 3648 queue { bulk prio } -queue bulk cbq( default ) -queue prio priority 7 +queue bulk bandwidth 70% cbq( default ) +queue prio bandwidth 30% priority 7 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio) pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue bulk pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio) diff --git a/regress/sbin/pfctl/pf58.in b/regress/sbin/pfctl/pf58.in index 831b90bb3d9..502c205cabe 100644 --- a/regress/sbin/pfctl/pf58.in +++ b/regress/sbin/pfctl/pf58.in @@ -2,7 +2,7 @@ altq on tun1000000 bandwidth 100Kb cbq queue { std ssh } altq on tun1000001 bandwidth 10Mb cbq queue { blah ssh } -queue std bandwidth 10% cbq(borrow, default) +queue std bandwidth 20% cbq(borrow, default) queue ssh bandwidth 30% cbq(borrow) { ssh2 } queue ssh2 bandwidth 80% -queue blah cbq(default) +queue blah bandwidth 60% cbq(default) diff --git a/regress/sbin/pfctl/pf58.ok b/regress/sbin/pfctl/pf58.ok index d9dd4e2ccf1..3cb53f673de 100644 --- a/regress/sbin/pfctl/pf58.ok +++ b/regress/sbin/pfctl/pf58.ok @@ -1,6 +1,6 @@ altq on tun1000000 cbq bandwidth 100Kb tbrsize 3000 queue { std ssh } altq on tun1000001 cbq bandwidth 10Mb tbrsize 12000 queue { blah ssh } -queue std bandwidth 10% cbq( borrow default ) +queue std bandwidth 20% cbq( borrow default ) queue ssh bandwidth 30% cbq( borrow ) { ssh2 } queue ssh2 bandwidth 80% -queue blah cbq( default ) +queue blah bandwidth 60% cbq( default ) |