adapt to nat changes

ok henning

8 files changed, 3 insertions, 54 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 19cf1f67959..027e8fca8c1 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.205 2009/05/14 22:57:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.206 2009/09/03 12:07:56 jsg Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -16,7 +16,7 @@ PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
 PFTESTS+=51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
 PFTESTS+=74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
 PFTESTS+=97 98
-PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 23 24 25 27
+PFFAIL=1 2 3 4 5 6 7 8 11 12 13 14 15 16 17 18 19 20 23 24 25 27
 PFFAIL+=28 29 30 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
 PFSIMPLE=1 2
 PFSETUP=1 2 3 4
@@ -29,7 +29,7 @@ PFALTQ=1 2 3 4 5 6 7 8 9 10 11 12 13 14
 # only testing parser, load test would be useless
 # PFLOAD+=6 22 41 50 52 53 55 57 83 85 86
 PFTABLE=1 2 3 4 5 6 7 8 9 10 11 12 13
-PFOPT=1 2 3 4 5 6
+PFOPT=1 2 3 5 6
 PFIF2IP=1 2 3
 PFCHKSUM=1 2 3
 
diff --git a/regress/sbin/pfctl/pfail10.in b/regress/sbin/pfctl/pfail10.in
deleted file mode 100644
index 996bdd2dbec..00000000000
--- a/regress/sbin/pfctl/pfail10.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# Test rule order processing: should fail unless nat -> filter
-set require-order yes
-pass in on lo1000000 all
-match out on lo0 all nat-to lo0
-
diff --git a/regress/sbin/pfctl/pfail10.ok b/regress/sbin/pfctl/pfail10.ok
deleted file mode 100644
index 03238df42d2..00000000000
--- a/regress/sbin/pfctl/pfail10.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-stdin:4: Rules must be in order: options, normalization, queueing, translation, filtering
-set require-order yes
diff --git a/regress/sbin/pfctl/pfail9.in b/regress/sbin/pfctl/pfail9.in
deleted file mode 100644
index 0b3ecda8cfb..00000000000
--- a/regress/sbin/pfctl/pfail9.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# Test rule order processing: should fail unless nat -> filter
-set require-order yes
-match in on lo0 all
-pass in on lo1000000 all
-# bork
-match out on lo0 all nat-to lo0
-
diff --git a/regress/sbin/pfctl/pfail9.ok b/regress/sbin/pfctl/pfail9.ok
deleted file mode 100644
index 5a120dcf388..00000000000
--- a/regress/sbin/pfctl/pfail9.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-stdin:6: Rules must be in order: options, normalization, queueing, translation, filtering
-set require-order yes
diff --git a/regress/sbin/pfctl/pfopt4.in b/regress/sbin/pfctl/pfopt4.in
deleted file mode 100644
index fd9b2442692..00000000000
--- a/regress/sbin/pfctl/pfopt4.in
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-
-# NAT -N
-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
-binat on $ext_if inet from 192.168.0.0/24 to 192.168.0.1/24 -> 192.168.0.3/24 
-
-# FILTER, -R
-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/pfopt4.ok b/regress/sbin/pfctl/pfopt4.ok
deleted file mode 100644
index a06225d4e1b..00000000000
--- a/regress/sbin/pfctl/pfopt4.ok
+++ /dev/null
@@ -1,7 +0,0 @@
-ext_if = "lo0"
-set limit states 100
-set block-policy drop
-set require-order yes
-nat on lo0 inet all -> 127.0.0.1
-rdr on lo0 inet all -> 127.0.0.1
-binat on lo0 inet from 192.168.0.0/24 to 192.168.0.0/24 -> 192.168.0.0/24
diff --git a/regress/sbin/pfctl/pfopt4.opts b/regress/sbin/pfctl/pfopt4.opts
deleted file mode 100644
index 059ac305028..00000000000
--- a/regress/sbin/pfctl/pfopt4.opts
+++ /dev/null
@@ -1 +0,0 @@
--N