we can enabled pfload48 now that tabledefs can live inside anchors

2 files changed, 32 insertions, 4 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index ad5f6d51ec2..1daccd6c669 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.132 2003/04/15 11:33:04 henning Exp $
+# $OpenBSD: Makefile,v 1.133 2003/04/30 13:14:40 henning Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -18,12 +18,10 @@ PFFAIL+=28 29 30 31 32 33 34 35 36
 PFSIMPLE=1 2
 PFSETUP=1 2 3
 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 49 54 56 60 61
+PFLOAD+=30 31 32 34 36 38 39 40 44 46 47 48 49 54 56 60 61
 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
-# disabled; no table def in anchors
-# PFLOAD+=48
 # only testing parser, load test would be useless
 # PFLOAD+=6 22 41 50 52 53 55 57
 PFTABLE=1 2 3 4 5 6 7 8 9 10 11 12 13
diff --git a/regress/sbin/pfctl/pf48.loaded b/regress/sbin/pfctl/pf48.loaded
index f3ac912e0db..fa4e44631d6 100644
--- a/regress/sbin/pfctl/pf48.loaded
+++ b/regress/sbin/pfctl/pf48.loaded
@@ -1,40 +1,70 @@
+@0 nat on lo0 inet from <regress.1:3> to <regress.2:*> -> 127.0.0.1
+[ Skip steps: d=end f=end p=end sp=end dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@1 nat on ! lo0 inet from ! <regress.1:3> to <regress.2:*> -> 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 rdr on lo0 inet from <regress.1:3> to <regress.2:*> -> 127.0.0.1
+[ Skip steps: d=end f=end p=end sp=end dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@1 rdr on ! lo0 inet from ! <regress.1:3> to <regress.2:*> -> 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 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 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ 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 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ 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 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ 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 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ 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 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ 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 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ 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 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ 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 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ 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 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ 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 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]