convert a bunch of rdr/nat rules to the new syntax

Things still need to be changed for route-to/binat/command line
options among other things.

ok henning

1 files changed, 9 insertions, 9 deletions

diff --git a/regress/sbin/pfctl/pf18.in b/regress/sbin/pfctl/pf18.in
index 9d19f7593e4..b19dcb4fb77 100644
--- a/regress/sbin/pfctl/pf18.in
+++ b/regress/sbin/pfctl/pf18.in
@@ -4,17 +4,17 @@ TEST_LIST1 = "{ 192.168.1.5, 192.168.1.6, 192.168.1.7 }"
 TEST_LIST2 = "{ 172.6.1.1, 172.14.1.2/32, 172.16.2.0/24 }"
 
 no nat on lo0 from 192.168.1.1 to 10.1.2.3
-nat on lo0 from 192.168.1.1 to any -> 10.0.0.1
-nat on lo0 proto tcp from 192.168.1.2 to any -> 10.0.0.2
-nat on lo0 proto udp from 192.168.1.3 to any -> 10.0.0.3
-nat on lo0 proto icmp from 192.168.1.4 to any -> 10.0.0.4
+match out on lo0 from 192.168.1.1 to any nat-to 10.0.0.1
+match out on lo0 proto tcp from 192.168.1.2 to any nat-to 10.0.0.2
+match out on lo0 proto udp from 192.168.1.3 to any nat-to 10.0.0.3
+match out on lo0 proto icmp from 192.168.1.4 to any nat-to 10.0.0.4
 
-nat on lo0 inet from $TEST_LIST1 to $TEST_LIST2 -> lo0
+match out on lo0 inet from $TEST_LIST1 to $TEST_LIST2 nat-to lo0
 
-nat on lo0 inet from 192.168.0.1/24 to any -> (lo0)
+match out on lo0 inet from 192.168.0.1/24 to any nat-to (lo0)
 
-nat on lo0 from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8
+match out on lo0 from 192.168.1.8 to ! 172.17.0.0/16 nat-to 10.0.0.8
 
-nat on ! lo0 proto { udp, tcp } from any to any -> 10.0.0.8 static-port
+match out on ! lo0 proto { udp, tcp } from any to any nat-to 10.0.0.8 static-port
 
-nat on { lo0, tun1000000 } from any to any -> 10.0.0.8
+match out on { lo0, tun1000000 } from any to any nat-to 10.0.0.8