Regression tests for table statements and rules containing tables.

ok henning@

4 files changed, 69 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 502a834949f..8de583a4896 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.64 2003/01/19 10:03:26 camield Exp $
+# $OpenBSD: Makefile,v 1.65 2003/01/25 20:46:45 cedric Exp $
 
 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
+PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
 PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
 PFSIMPLE=1 2
 PFSETUP=1
 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 33 34 35 36 38 39 40 43 44
+PFLOAD+=30 31 32 33 34 35 36 38 39 40 43 44 48
 PFTABLE=1 2 3 4 5 6 7 8 9 10 11 12
 
 .for n in ${PFFAIL}
diff --git a/regress/sbin/pfctl/pf48.in b/regress/sbin/pfctl/pf48.in
new file mode 100644
index 00000000000..6e408028793
--- /dev/null
+++ b/regress/sbin/pfctl/pf48.in
@@ -0,0 +1,12 @@
+table <regress> { 1.2.3.4 !5.6.7.8 10/8 lo0 }
+table <regress.1> const { ::1 fe80::/64 localhost }
+scrub in from { <regress.1> !<regress.2> } to any
+scrub out from any to { !<regress.1>, <regress.2> }
+nat on lo0 from <regress.1> to <regress.2> -> lo0
+nat on !lo0 from !<regress.1> to <regress.2> -> lo0
+rdr on lo0 from <regress.1> to <regress.2> -> lo0
+rdr on !lo0 from !<regress.1> to <regress.2> -> lo0
+pass in from <regress> to any
+pass out from any to <regress>
+pass in from { <regress.1> <regress.2> } to any
+pass out from any to { !<regress.1>, !<regress.2> }
diff --git a/regress/sbin/pfctl/pf48.loaded b/regress/sbin/pfctl/pf48.loaded
new file mode 100644
index 00000000000..f3ac912e0db
--- /dev/null
+++ b/regress/sbin/pfctl/pf48.loaded
@@ -0,0 +1,40 @@
+@0 scrub in from <regress.1:3> to any fragment reassemble 
+[ Skip steps: i=end d=2 f=end p=end sp=end da=2 dp=end ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@1 scrub in from ! <regress.2:*> to any fragment reassemble 
+[ Skip steps: i=end f=end p=end sp=end dp=end ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@2 scrub out from any to ! <regress.1:3> fragment reassemble 
+[ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@3 scrub out from any to <regress.2:*> fragment reassemble 
+[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@0 pass in from <regress:6> to any 
+[ Skip steps: i=end f=end p=end sp=end dp=end ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@1 pass out from any to <regress:6> 
+[ Skip steps: i=end f=end p=end sp=end dp=end ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@2 pass in from <regress.1:3> to any 
+[ Skip steps: i=end d=4 f=end p=end sp=end da=4 dp=end ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@3 pass in from <regress.2:*> to any 
+[ Skip steps: i=end f=end p=end sp=end dp=end ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@4 pass out from any to ! <regress.1:3> 
+[ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@5 pass out from any to ! <regress.2:*> 
+[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
diff --git a/regress/sbin/pfctl/pf48.ok b/regress/sbin/pfctl/pf48.ok
new file mode 100644
index 00000000000..10da0726fb1
--- /dev/null
+++ b/regress/sbin/pfctl/pf48.ok
@@ -0,0 +1,14 @@
+scrub in from <regress.1> to any fragment reassemble 
+scrub in from ! <regress.2> to any fragment reassemble 
+scrub out from any to ! <regress.1> fragment reassemble 
+scrub out from any to <regress.2> fragment reassemble 
+nat on lo0 inet from <regress.1> to <regress.2> -> 127.0.0.1
+nat on ! lo0 inet from ! <regress.1> to <regress.2> -> 127.0.0.1
+rdr on lo0 inet from <regress.1> to <regress.2> -> 127.0.0.1
+rdr on ! lo0 inet from ! <regress.1> to <regress.2> -> 127.0.0.1
+pass in from <regress> to any 
+pass out from any to <regress> 
+pass in from <regress.1> to any 
+pass in from <regress.2> to any 
+pass out from any to ! <regress.1> 
+pass out from any to ! <regress.2>