diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2003-02-12 12:52:49 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2003-02-12 12:52:49 +0000 |
| commit | b0474e5b1be0755b77ee8026cccba7b6417cabed (patch) | |
| tree | f338b68dc8e08a66f1d4ca38ff1f7af530bbffd1 | |
| parent | d15fe7a83961af6c305059fa2c1cc363adf966e8 (diff) | |
Match changes in pfctl which make rdr behave more like the other rule types.
ok dhartmei@
| -rw-r--r-- | regress/sbin/pfctl/pf16.ok | 2 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf19.ok | 18 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf20.ok | 16 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pf41.ok | 10 |
4 files changed, 23 insertions, 23 deletions
diff --git a/regress/sbin/pfctl/pf16.ok b/regress/sbin/pfctl/pf16.ok index 9f32f05915c..4216342fae1 100644 --- a/regress/sbin/pfctl/pf16.ok +++ b/regress/sbin/pfctl/pf16.ok @@ -1,5 +1,5 @@ scrub in on lo0 all fragment reassemble nat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1 -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 any to 1.2.3.4 port = 2222 -> 10.0.0.10 port 22 binat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1 pass in on lo1 all diff --git a/regress/sbin/pfctl/pf19.ok b/regress/sbin/pfctl/pf19.ok index 7d460d62395..b57f610d04e 100644 --- a/regress/sbin/pfctl/pf19.ok +++ b/regress/sbin/pfctl/pf19.ok @@ -2,12 +2,12 @@ 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 }" -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.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.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.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.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 +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.0/25 port = ftp -> 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 = ftp -> 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 = ftp -> 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 = ftp -> 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 = ftp -> 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 = ftp -> 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 = ftp -> 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 = ftp -> 127.0.0.1 port 8021 diff --git a/regress/sbin/pfctl/pf20.ok b/regress/sbin/pfctl/pf20.ok index b3e3633f95e..44fb8c9d3e6 100644 --- a/regress/sbin/pfctl/pf20.ok +++ b/regress/sbin/pfctl/pf20.ok @@ -6,11 +6,11 @@ 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.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 -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.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.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.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 +rdr on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 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 = ftp -> 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 = ftp -> 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 = ftp -> 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 = ftp -> 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 = ftp -> 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 = ftp -> 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 = ftp -> 127.0.0.1 port 8021 diff --git a/regress/sbin/pfctl/pf41.ok b/regress/sbin/pfctl/pf41.ok index 256945fe23c..f2a6acc91a3 100644 --- a/regress/sbin/pfctl/pf41.ok +++ b/regress/sbin/pfctl/pf41.ok @@ -34,12 +34,12 @@ nat-anchor foo inet proto tcp from 10.2.3.4 port < 2100 to 10.3.4.5 port < 1000 nat-anchor foo inet proto tcp from 10.2.3.4 port < 2100 to 10.3.4.5 port > 1100 nat-anchor foo inet proto tcp from 10.2.3.4 port < 2100 to 10.4.5.6 port < 1000 nat-anchor foo inet proto tcp from 10.2.3.4 port < 2100 to 10.4.5.6 port > 1100 -rdr-anchor bar from any to any -rdr-anchor bar from any to any -rdr-anchor bar from any to any +rdr-anchor bar all +rdr-anchor bar all +rdr-anchor bar all rdr-anchor bar inet proto tcp from 10.0.0.0/8 to ! 1.2.3.4 -rdr-anchor bar inet proto udp from any to 10.1.2.0/24 port 25 -rdr-anchor bar inet proto tcp from any to 10.1.2.0/24 port 25 +rdr-anchor bar inet proto udp from any to 10.1.2.0/24 port = 25 +rdr-anchor bar inet proto tcp from any to 10.1.2.0/24 port = smtp binat-anchor baz from any to any binat-anchor baz from any to any binat-anchor baz from any to any |