diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2002-12-07 20:53:06 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2002-12-07 20:53:06 +0000 |
| commit | 55305551ca42dfb572aa9af41d471ffb83310817 (patch) | |
| tree | a48543dd5520abef51df421ce9ed65b2f9e7f119 /regress | |
| parent | 0e1b59492856e94e3507071aaa0bdc101e94a705 (diff) | |
now that we use the MTU from the interface instead of assuming 1500 the
tbrsize and the minimum useful bandwidth are different on lo0/lo1. cope with
that.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/sbin/pfctl/pf33.in | 4 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf33.ok | 6 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf37.ok | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/regress/sbin/pfctl/pf33.in b/regress/sbin/pfctl/pf33.in index 41328dac5aa..50e01474ebe 100644 --- a/regress/sbin/pfctl/pf33.in +++ b/regress/sbin/pfctl/pf33.in @@ -7,8 +7,8 @@ queue http bandwidth 1.5Mb priority 3 { http_vhosts, http_cust1 } queue http_vhosts bandwidth 40% cbq(borrow red) queue http_cust1 bandwidth 0.5Mb queue mail bandwidth 10% priority 1 -queue ssh bandwidth 100Kb priority 7 cbq(borrow) -queue rsets bandwidth 7500b priority 0 cbq(red) +queue ssh bandwidth 200Kb priority 7 cbq(borrow) +queue rsets bandwidth 150000b priority 0 cbq(red) block return in on $ext_if inet all queue rsets pass in on $ext_if inet proto tcp from any to any port 80 keep state queue http diff --git a/regress/sbin/pfctl/pf33.ok b/regress/sbin/pfctl/pf33.ok index be6115e8a4f..56bebcd1f09 100644 --- a/regress/sbin/pfctl/pf33.ok +++ b/regress/sbin/pfctl/pf33.ok @@ -1,12 +1,12 @@ ext_if = "lo0" -altq on lo0 scheduler cbq bandwidth 10.00Mb tbrsize 6000 queue { deflt http ssh mail rsets } +altq on lo0 scheduler 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 ) queue http_cust1 bandwidth 500.00Kb queue mail bandwidth 1000.00Kb -queue ssh bandwidth 100.00Kb priority 7 cbq( borrow ) -queue rsets bandwidth 7.50Kb priority 0 cbq( red ) +queue ssh bandwidth 200.00Kb priority 7 cbq( borrow ) +queue rsets bandwidth 150.00Kb priority 0 cbq( red ) block return in on lo0 inet all queue rsets pass in on lo0 inet proto tcp from any to any port = www keep state queue http pass out on lo0 inet proto tcp from any to any port = ssh keep state queue ssh diff --git a/regress/sbin/pfctl/pf37.ok b/regress/sbin/pfctl/pf37.ok index df0dd281b35..5392085d1ce 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 6000 queue { std } -altq on lo1 scheduler cbq bandwidth 10.00Mb tbrsize 6000 queue { std } +altq on lo0 scheduler cbq bandwidth 10.00Mb tbrsize 1824 queue { std } +altq on lo1 scheduler cbq bandwidth 10.00Mb tbrsize 1824 queue { std } queue std bandwidth 10.00Mb cbq( default ) |