test tagging on rdr

4 files changed, 25 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index d4023f04af5..f6f11b9046f 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.140 2003/05/14 05:29:08 henning Exp $
+# $OpenBSD: Makefile,v 1.141 2003/05/14 22:46:34 henning Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -12,13 +12,13 @@
 
 PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
 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
+PFTESTS+=51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
 PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
 PFFAIL+=28 29 30 31 32 33 34 35 36
 PFSIMPLE=1 2
 PFSETUP=1 2 3 4
 PFLOAD=1 2 3 4 5 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 23 24 25 26 27 28 29
-PFLOAD+=30 31 32 34 36 38 39 40 44 46 47 48 49 54 56 60 61 65 66 67 68 69 70
+PFLOAD+=30 31 32 34 36 38 39 40 44 46 47 48 49 54 56 60 61 65 66 67 68 69 70 71
 PFALTQ=1 2 3 4 5 6 7 8 9 10 11 12 13 14
 # disabled; no altq in anchors
 # PFLOAD+=33 35 37 42 43 45 51 58 59 62 63 64
diff --git a/regress/sbin/pfctl/pf71.in b/regress/sbin/pfctl/pf71.in
new file mode 100644
index 00000000000..b8b11b1ec80
--- /dev/null
+++ b/regress/sbin/pfctl/pf71.in
@@ -0,0 +1,4 @@
+no rdr on lo0 from 10.0.1.0/24 tag regress
+   rdr on lo0 proto tcp from 10.0.0.0/8 to port 80 -> lo0
+block out on lo0 tagged regress
+
diff --git a/regress/sbin/pfctl/pf71.loaded b/regress/sbin/pfctl/pf71.loaded
new file mode 100644
index 00000000000..c02e0e90098
--- /dev/null
+++ b/regress/sbin/pfctl/pf71.loaded
@@ -0,0 +1,15 @@
+@0 no rdr on lo0 inet from 10.0.1.0/24 to any tag regress 
+[ Skip steps: i=end d=end f=end sp=end da=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@1 rdr on lo0 inet proto tcp from 10.0.0.0/8 to any port = www -> 127.0.0.1
+[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@0 block drop out on lo0 all tagged regress 
+[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
diff --git a/regress/sbin/pfctl/pf71.ok b/regress/sbin/pfctl/pf71.ok
new file mode 100644
index 00000000000..e561e72e282
--- /dev/null
+++ b/regress/sbin/pfctl/pf71.ok
@@ -0,0 +1,3 @@
+no rdr on lo0 inet from 10.0.1.0/24 to any tag regress 
+rdr on lo0 inet proto tcp from 10.0.0.0/8 to any port = www -> 127.0.0.1
+block drop out on lo0 all tagged regress