src - OpenBSD base system

diff options


context:
space:
mode:

author	Camiel Dobbelaar <camield@cvs.openbsd.org>	2002-10-22 07:10:34 +0000
committer	Camiel Dobbelaar <camield@cvs.openbsd.org>	2002-10-22 07:10:34 +0000
commit	f66166115ab27a20882bd8154058c8aa26871542 (patch)
tree	9e9813ba8d1c2a21f370d6c8ce87d16b2545cfe3
parent	d7c1aefc5698cf538b7942f6328e0110781c8b25 (diff)

Update for new semantics of set_ipmask (netmask is applied immediately

to an address by pfctl).

Diffstat

-rw-r--r--

regress/sbin/pfctl/pf12.ok

-rw-r--r--

regress/sbin/pfctl/pf13.ok

-rw-r--r--

regress/sbin/pfctl/pf18.ok

-rw-r--r--

regress/sbin/pfctl/pf19.ok

-rw-r--r--

regress/sbin/pfctl/pf20.ok

5 files changed, 18 insertions, 18 deletions

diff --git a/regress/sbin/pfctl/pf12.ok b/regress/sbin/pfctl/pf12.ok
index b322e017333..7b433d00d0c 100644
--- a/regress/sbin/pfctl/pf12.ok
+++ b/regress/sbin/pfctl/pf12.ok

@@ -1,5 +1,5 @@

-@0 pass in inet from 127.0.0.1 to 127.0.0.1/8

-@1 pass in inet from 127.0.0.1/16 to 127.0.0.1/24

-@2 pass in inet from 127.0.0.1/25 to ! 127.0.0.1/26

-@3 pass in inet from ! 127.0.0.1 to 127.0.0.1/16

-@4 pass in inet from ! 127.0.0.1 to ! 127.0.0.1/8

+@0 pass in inet from 127.0.0.1 to 127.0.0.0/8

+@1 pass in inet from 127.0.0.0/16 to 127.0.0.0/24

+@2 pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26

+@3 pass in inet from ! 127.0.0.1 to 127.0.0.0/16

+@4 pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8

diff --git a/regress/sbin/pfctl/pf13.ok b/regress/sbin/pfctl/pf13.ok
index 44a88445dfe..1d896fe3b02 100644
--- a/regress/sbin/pfctl/pf13.ok
+++ b/regress/sbin/pfctl/pf13.ok

@@ -7,6 +7,6 @@

@6 block in on tun0 dup-to (tun1 192.168.1.1) inet proto tcp from any to any port = ftp

@7 block in on tun0 dup-to (tun1 fec0::1) inet6 proto tcp from any to any port = ftp

@8 pass in quick on tun0 route-to tun1 inet from 192.168.1.1 to 10.1.1.1

-@9 pass in quick on tun0 route-to tun1 inet6 from fec0::1/64 to fec1::2

+@9 pass in quick on tun0 route-to tun1 inet6 from fec0::/64 to fec1::2

@10 pass in quick on tun0 dup-to (tun1 192.168.1.100) inet from 192.168.1.1 to 10.1.1.1

-@11 pass in quick on tun0 dup-to (tun1 fec1::2) inet6 from fec0::1/64 to fec1::2

+@11 pass in quick on tun0 dup-to (tun1 fec1::2) inet6 from fec0::/64 to fec1::2

diff --git a/regress/sbin/pfctl/pf18.ok b/regress/sbin/pfctl/pf18.ok
index 5b1f25b665b..e7640ceddd1 100644
--- a/regress/sbin/pfctl/pf18.ok
+++ b/regress/sbin/pfctl/pf18.ok

@@ -14,7 +14,7 @@ nat on lo0 inet from 192.168.1.6 to 172.16.2.0/24 -> 127.0.0.1

nat on lo0 inet from 192.168.1.7 to 172.6.1.1 -> 127.0.0.1

nat on lo0 inet from 192.168.1.7 to 172.14.1.2 -> 127.0.0.1

nat on lo0 inet from 192.168.1.7 to 172.16.2.0/24 -> 127.0.0.1

-nat on lo0 inet from 192.168.0.1/24 to any -> (lo0)

+nat on lo0 inet from 192.168.0.0/24 to any -> (lo0)

nat on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8

nat on ! lo0 inet proto udp all -> 10.0.0.8

nat on ! lo0 inet proto tcp all -> 10.0.0.8

diff --git a/regress/sbin/pfctl/pf19.ok b/regress/sbin/pfctl/pf19.ok
index b5f27565460..ad8a727b0e1 100644
--- a/regress/sbin/pfctl/pf19.ok
+++ b/regress/sbin/pfctl/pf19.ok

@@ -3,11 +3,11 @@ GOOD = { lo0, lo1 }

GOOD_NET = { 127.0.0.0/24, 10.0.1.0/24 }

DEST_NET = { 1.2.3.4/25, 2.4.6.8/30 }

rdr on lo0 inet proto tcp from any to 1.2.3.4 port 2222 -> 10.0.0.10 port 22

-rdr on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021

+rdr on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port 21 -> 127.0.0.1 port 8021

rdr on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021

-rdr on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021

+rdr on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port 21 -> 127.0.0.1 port 8021

rdr on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021

-rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021

+rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port 21 -> 127.0.0.1 port 8021

rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021

-rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021

+rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port 21 -> 127.0.0.1 port 8021

rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021

diff --git a/regress/sbin/pfctl/pf20.ok b/regress/sbin/pfctl/pf20.ok
index 4910e3cc004..484fbfd7d89 100644
--- a/regress/sbin/pfctl/pf20.ok
+++ b/regress/sbin/pfctl/pf20.ok

@@ -2,15 +2,15 @@ EVIL = lo0

GOOD = { lo0, lo1 }

GOOD_NET = { 127.0.0.0/24, 10.0.1.0/24 }

DEST_NET = { 1.2.3.4/25, 2.4.6.8/30 }

-nat on lo0 inet from 127.0.0.0/24 to 1.2.3.4/25 -> 127.0.0.1

+nat on lo0 inet from 127.0.0.0/24 to 1.2.3.0/25 -> 127.0.0.1

nat on lo0 inet from 127.0.0.0/24 to 2.4.6.8/30 -> 127.0.0.1

-nat on lo0 inet from 10.0.1.0/24 to 1.2.3.4/25 -> 127.0.0.1

+nat on lo0 inet from 10.0.1.0/24 to 1.2.3.0/25 -> 127.0.0.1

nat on lo0 inet from 10.0.1.0/24 to 2.4.6.8/30 -> 127.0.0.1