diff options
author | Henning Brauer <henning@cvs.openbsd.org> | 2003-03-03 14:18:05 +0000 |
---|---|---|
committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-03-03 14:18:05 +0000 |
commit | 3aaee7f141989d99ba9e83163717b39c21c53ffd (patch) | |
tree | fc0814595d91d3387adad74a066459beef81bc31 /regress/sbin/pfctl | |
parent | 05e8929fe4dc52ebf25cfb6152c232ea9f9f68fc (diff) |
regen
Diffstat (limited to 'regress/sbin/pfctl')
-rw-r--r-- | regress/sbin/pfctl/pf33.ok | 8 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf35.ok | 2 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf37.ok | 4 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf42.ok | 2 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf43.ok | 2 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf45.ok | 2 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf51.ok | 4 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf58.ok | 4 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfail18.ok | 2 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfopt3.ok | 2 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfsetup2.ok | 2 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfsetup3.ok | 2 |
12 files changed, 18 insertions, 18 deletions
diff --git a/regress/sbin/pfctl/pf33.ok b/regress/sbin/pfctl/pf33.ok index 32bb4e1fb7c..2b3b483ca13 100644 --- a/regress/sbin/pfctl/pf33.ok +++ b/regress/sbin/pfctl/pf33.ok @@ -1,12 +1,12 @@ ext_if = "lo0" -altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { deflt http ssh mail rsets } +altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { deflt http ssh mail rsets } queue deflt bandwidth 10% priority 0 cbq( red ecn default ) queue http bandwidth 1.50Mb priority 3 { http_vhosts http_cust1 } queue http_vhosts bandwidth 40% cbq( red borrow ) -queue http_cust1 bandwidth 500.00Kb +queue http_cust1 bandwidth 500Kb queue mail bandwidth 10% -queue ssh bandwidth 200.00Kb priority 7 cbq( borrow ) -queue rsets bandwidth 150.00Kb priority 0 cbq( red ) +queue ssh bandwidth 200Kb priority 7 cbq( borrow ) +queue rsets bandwidth 150Kb 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/pf35.ok b/regress/sbin/pfctl/pf35.ok index bdf8144b307..1aa490f80e5 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 cbq( red ecn ) bandwidth 10.00Mb qlimit 100 tbrsize 5000 queue { std http mail ssh } +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 diff --git a/regress/sbin/pfctl/pf37.ok b/regress/sbin/pfctl/pf37.ok index af650d9542c..d8013dcc83a 100644 --- a/regress/sbin/pfctl/pf37.ok +++ b/regress/sbin/pfctl/pf37.ok @@ -1,3 +1,3 @@ -altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { std } -altq on lo1 cbq bandwidth 10.00Mb tbrsize 1824 queue { std } +altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { std } +altq on lo1 cbq bandwidth 10Mb tbrsize 1824 queue { std } queue std cbq( default ) diff --git a/regress/sbin/pfctl/pf42.ok b/regress/sbin/pfctl/pf42.ok index bbf97038409..bdd1add878c 100644 --- a/regress/sbin/pfctl/pf42.ok +++ b/regress/sbin/pfctl/pf42.ok @@ -1,5 +1,5 @@ ext_if = "lo0" -altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { deflt http ssh mail rsets } +altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { deflt http ssh mail rsets } queue deflt bandwidth 10% priority 0 cbq( red ecn default ) queue http bandwidth 1.50Mb priority 3 { http_vhosts http_cust1 } queue http_vhosts bandwidth 40% cbq( red borrow ) diff --git a/regress/sbin/pfctl/pf43.ok b/regress/sbin/pfctl/pf43.ok index 97954d8b0b8..b6bf13914d9 100644 --- a/regress/sbin/pfctl/pf43.ok +++ b/regress/sbin/pfctl/pf43.ok @@ -1,4 +1,4 @@ -altq on lo0 cbq bandwidth 100.00Mb tbrsize 3648 queue { bulk prio } +altq on lo0 cbq bandwidth 100Mb tbrsize 3648 queue { bulk prio } queue bulk cbq( default ) queue prio priority 7 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/pf45.ok b/regress/sbin/pfctl/pf45.ok index 6175c277452..6f5b89564c1 100644 --- a/regress/sbin/pfctl/pf45.ok +++ b/regress/sbin/pfctl/pf45.ok @@ -1,4 +1,4 @@ -altq on lo0 priq bandwidth 10.00Mb tbrsize 1824 queue { pri-low pri-med pri-high } +altq on lo0 priq bandwidth 10Mb tbrsize 1824 queue { pri-low pri-med pri-high } queue pri-low priority 0 queue pri-med priq( default ) queue pri-high priority 2 diff --git a/regress/sbin/pfctl/pf51.ok b/regress/sbin/pfctl/pf51.ok index 89f12077218..de03ba2445f 100644 --- a/regress/sbin/pfctl/pf51.ok +++ b/regress/sbin/pfctl/pf51.ok @@ -1,6 +1,6 @@ pass in on lo0 all set require-order no nat on lo0 inet all -> 127.0.0.1 -altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { toad frog } -queue toad bandwidth 1.00Mb +altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { toad frog } +queue toad bandwidth 1Mb queue frog bandwidth 90% cbq( default ) diff --git a/regress/sbin/pfctl/pf58.ok b/regress/sbin/pfctl/pf58.ok index 6ca721da9c5..fbc22c992cc 100644 --- a/regress/sbin/pfctl/pf58.ok +++ b/regress/sbin/pfctl/pf58.ok @@ -1,5 +1,5 @@ -altq on ppp0 cbq bandwidth 100.00Kb tbrsize 1500 queue { std ssh } -altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { blah ssh } +altq on ppp0 cbq bandwidth 100Kb tbrsize 1500 queue { std ssh } +altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { blah ssh } queue std bandwidth 10% cbq( borrow default ) queue ssh bandwidth 30% cbq( borrow ) { ssh2 } queue ssh2 bandwidth 80% diff --git a/regress/sbin/pfctl/pfail18.ok b/regress/sbin/pfctl/pfail18.ok index d66d38d41ce..4270494b08a 100644 --- a/regress/sbin/pfctl/pfail18.ok +++ b/regress/sbin/pfctl/pfail18.ok @@ -1,5 +1,5 @@ stdin:6: queue has no parent pfctl: Syntax error in file: pf rules not loaded -altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { frenchs eat frogs } +altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { frenchs eat frogs } queue frenchs bandwidth 30% cbq( default ) queue eat bandwidth 30% diff --git a/regress/sbin/pfctl/pfopt3.ok b/regress/sbin/pfctl/pfopt3.ok index 54a934d27e4..5df4fcaca25 100644 --- a/regress/sbin/pfctl/pfopt3.ok +++ b/regress/sbin/pfctl/pfopt3.ok @@ -1,7 +1,7 @@ ext_if = "lo0" set block-policy drop set require-order yes -altq on lo0 priq bandwidth 10.00Mb tbrsize 1824 queue { pri-low pri-med pri-high } +altq on lo0 priq bandwidth 10Mb tbrsize 1824 queue { pri-low pri-med pri-high } queue pri-low priority 0 queue pri-med priq( default ) queue pri-high priority 2 diff --git a/regress/sbin/pfctl/pfsetup2.ok b/regress/sbin/pfctl/pfsetup2.ok index abb7c72073b..90333b02fbd 100644 --- a/regress/sbin/pfctl/pfsetup2.ok +++ b/regress/sbin/pfctl/pfsetup2.ok @@ -1,2 +1,2 @@ -altq on lo1 cbq bandwidth 10.00Mb tbrsize 6000 queue { openbsd rocks } +altq on lo1 cbq bandwidth 10Mb tbrsize 6000 queue { openbsd rocks } queue openbsd cbq( default ) diff --git a/regress/sbin/pfctl/pfsetup3.ok b/regress/sbin/pfctl/pfsetup3.ok index 7c772cd143e..82ed7fbeeab 100644 --- a/regress/sbin/pfctl/pfsetup3.ok +++ b/regress/sbin/pfctl/pfsetup3.ok @@ -1,2 +1,2 @@ -altq on lo1 cbq bandwidth 10.00Mb tbrsize 32000 queue { openbsd rocks } +altq on lo1 cbq bandwidth 10Mb tbrsize 32000 queue { openbsd rocks } queue openbsd cbq( default ) |