diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2010-03-23 13:32:32 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2010-03-23 13:32:32 +0000 |
| commit | 057d9e8cb62e8e79b31cf4ce1af53e06c3d9e371 (patch) | |
| tree | 67cb8815eece8814d63a8887b952281ef4a9c30b | |
| parent | 29f00368cb030a23d7413513a3e6b804a97c49e0 (diff) | |
adjust after -A / -O / -R / -T load removal
| -rw-r--r-- | regress/sbin/pfctl/pfopt2.in | 17 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfopt2.opts | 1 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfopt3.in | 18 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfopt3.ok | 3 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfopt3.opts | 1 |
5 files changed, 0 insertions, 40 deletions
diff --git a/regress/sbin/pfctl/pfopt2.in b/regress/sbin/pfctl/pfopt2.in index f72b26ad088..c10ff6663d1 100644 --- a/regress/sbin/pfctl/pfopt2.in +++ b/regress/sbin/pfctl/pfopt2.in @@ -1,25 +1,8 @@ ext_if="lo0" -# OPTIONS, -O set loginterface $ext_if set timeout tcp.established 3600 set limit states 100 set optimization normal set block-policy drop set require-order yes - -# QUEUEING, -A -altq on $ext_if priq bandwidth 10Mb tbrsize 1824 \ - queue { pri-low pri-med pri-high } -queue pri-low priority 0 -queue pri-med priority 1 priq(default) -queue pri-high priority 2 - -# FILTER, -R -match in on $ext_if inet from any to any rdr-to 127.0.0.1 -match out on $ext_if inet from any to any nat-to 127.0.0.1 -match on $ext_if inet from 192.168.0.0/24 to 192.168.0.1/24 binat-to 192.168.0.3/24 -pass out on $ext_if proto tcp from any to any port 22 keep state \ - queue(pri-med, pri-high) -pass out on $ext_if proto tcp from any to any port 80 keep state queue pri-med -pass in on $ext_if proto tcp from any to any port 80 keep state queue pri-low diff --git a/regress/sbin/pfctl/pfopt2.opts b/regress/sbin/pfctl/pfopt2.opts index ebc68ab83c0..e69de29bb2d 100644 --- a/regress/sbin/pfctl/pfopt2.opts +++ b/regress/sbin/pfctl/pfopt2.opts @@ -1 +0,0 @@ --O diff --git a/regress/sbin/pfctl/pfopt3.in b/regress/sbin/pfctl/pfopt3.in index f72b26ad088..b9552e40134 100644 --- a/regress/sbin/pfctl/pfopt3.in +++ b/regress/sbin/pfctl/pfopt3.in @@ -1,25 +1,7 @@ ext_if="lo0" -# OPTIONS, -O -set loginterface $ext_if -set timeout tcp.established 3600 -set limit states 100 -set optimization normal -set block-policy drop -set require-order yes - -# QUEUEING, -A altq on $ext_if priq bandwidth 10Mb tbrsize 1824 \ queue { pri-low pri-med pri-high } queue pri-low priority 0 queue pri-med priority 1 priq(default) queue pri-high priority 2 - -# FILTER, -R -match in on $ext_if inet from any to any rdr-to 127.0.0.1 -match out on $ext_if inet from any to any nat-to 127.0.0.1 -match on $ext_if inet from 192.168.0.0/24 to 192.168.0.1/24 binat-to 192.168.0.3/24 -pass out on $ext_if proto tcp from any to any port 22 keep state \ - queue(pri-med, pri-high) -pass out on $ext_if proto tcp from any to any port 80 keep state queue pri-med -pass in on $ext_if proto tcp from any to any port 80 keep state queue pri-low diff --git a/regress/sbin/pfctl/pfopt3.ok b/regress/sbin/pfctl/pfopt3.ok index 4b5f8707fef..6485717dcee 100644 --- a/regress/sbin/pfctl/pfopt3.ok +++ b/regress/sbin/pfctl/pfopt3.ok @@ -1,7 +1,4 @@ ext_if = "lo0" -set limit states 100 -set block-policy drop -set require-order yes 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 ) diff --git a/regress/sbin/pfctl/pfopt3.opts b/regress/sbin/pfctl/pfopt3.opts index d8439a99f37..e69de29bb2d 100644 --- a/regress/sbin/pfctl/pfopt3.opts +++ b/regress/sbin/pfctl/pfopt3.opts @@ -1 +0,0 @@ --A |