cope with pfctl changes

10 files changed, 29 insertions, 55 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 3fdae0b44e5..964c534af00 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.178 2004/05/21 23:10:49 dhartmei Exp $
+# $OpenBSD: Makefile,v 1.179 2004/06/29 22:14:30 henning Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -14,8 +14,8 @@ 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 71 72 73
 PFTESTS+=74 75 76 77 78 79 80 81 82 83 84 85 86
-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 27
-PFFAIL+=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 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
 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
@@ -168,8 +168,8 @@ pfi${n}-update:
 
 pfi:            ${PFI_TARGETS}
 pfi-update:     ${PFI_UPDATES}
-REGRESS_TARGETS+=pfi
-UPDATE_TARGETS+=pfi-update
+# REGRESS_TARGETS+=pfi
+# UPDATE_TARGETS+=pfi-update
 
 .for n in ${PFOPT}
 PFOPT_TARGETS+=pfopt${n}
diff --git a/regress/sbin/pfctl/pf15.in b/regress/sbin/pfctl/pf15.in
index 8dd2f2b2ff6..945b8b518c8 100644
--- a/regress/sbin/pfctl/pf15.in
+++ b/regress/sbin/pfctl/pf15.in
@@ -10,7 +10,4 @@ scrub in inet from { 10.0.0.1, 10.0.0.2 } to { 10.0.0.3, 10.0.0.4 }
 scrub in from { lo0 10.1.1.1 } to any
 scrub in from { 10.0.0.1 lo0 } to any
 scrub in from !lo0 to any
-scrub in from !lo
 scrub in on !lo0
-scrub in on !lo
-scrub in from (lo:network) to (lo)
diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded
index f97cdf506a1..73c0e874ab1 100644
--- a/regress/sbin/pfctl/pf15.loaded
+++ b/regress/sbin/pfctl/pf15.loaded
@@ -55,70 +55,50 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 scrub in inet from 127.0.0.1 to any fragment reassemble
-  [ Skip steps: i=16 d=end p=end sp=end da=30 dp=end ]
+  [ Skip steps: i=16 d=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 scrub in inet6 from ::1 to any fragment reassemble
-  [ Skip steps: d=end f=17 p=end sp=end da=30 dp=end ]
+  [ Skip steps: d=end f=17 p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 scrub in on lo0 inet6 from fe80::1 to any fragment reassemble
-  [ Skip steps: d=end p=end sp=end da=30 dp=end ]
+  [ Skip steps: d=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 scrub in inet from 10.1.1.1 to any fragment reassemble
-  [ Skip steps: i=21 d=end f=20 p=end sp=end da=30 dp=end ]
+  [ Skip steps: i=21 d=end f=20 p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 scrub in inet from 10.0.0.1 to any fragment reassemble
-  [ Skip steps: i=21 d=end f=20 p=end sp=end da=30 dp=end ]
+  [ Skip steps: i=21 d=end f=20 p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 scrub in inet from 127.0.0.1 to any fragment reassemble
-  [ Skip steps: i=21 d=end p=end sp=end da=30 dp=end ]
+  [ Skip steps: i=21 d=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 scrub in inet6 from ::1 to any fragment reassemble
-  [ Skip steps: d=end f=22 p=end sp=end da=30 dp=end ]
+  [ Skip steps: d=end f=22 p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 scrub in on lo0 inet6 from fe80::1 to any fragment reassemble
-  [ Skip steps: d=end p=end sp=end da=30 dp=end ]
+  [ Skip steps: d=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 scrub in inet from ! 127.0.0.1 to any fragment reassemble
-  [ Skip steps: i=24 d=end p=end sp=end da=30 dp=end ]
+  [ Skip steps: i=24 d=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 scrub in inet6 from ! ::1 to any fragment reassemble
-  [ Skip steps: d=end f=25 p=end sp=end da=30 dp=end ]
+  [ Skip steps: d=end f=25 p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 scrub in on lo0 inet6 from ! fe80::1 to any fragment reassemble
-  [ Skip steps: d=end p=end sp=end da=30 dp=end ]
+  [ Skip steps: d=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@25 scrub in inet from ! 127.0.0.1 to any fragment reassemble
-  [ Skip steps: i=27 d=end p=end sp=end da=30 dp=end ]
-  [ queue: qname= qid=0 pqname= pqid=0 ]
-  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@26 scrub in inet6 from ! ::1 to any fragment reassemble
-  [ Skip steps: d=end f=28 p=end sp=end da=30 dp=end ]
-  [ queue: qname= qid=0 pqname= pqid=0 ]
-  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@27 scrub in on lo0 inet6 from ! fe80::1 to any fragment reassemble
-  [ Skip steps: d=end p=end sp=end da=30 dp=end ]
-  [ queue: qname= qid=0 pqname= pqid=0 ]
-  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@28 scrub in on ! lo0 all fragment reassemble
-  [ Skip steps: d=end f=end p=end sa=30 sp=end da=30 dp=end ]
-  [ queue: qname= qid=0 pqname= pqid=0 ]
-  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@29 scrub in on ! lo all fragment reassemble
-  [ 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     ]
-@30 scrub in from (lo:network:2) to (lo:3) fragment reassemble
+@25 scrub in on ! lo0 all 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     ]
diff --git a/regress/sbin/pfctl/pf15.ok b/regress/sbin/pfctl/pf15.ok
index 5e1e3b3f5b2..c98b8db4810 100644
--- a/regress/sbin/pfctl/pf15.ok
+++ b/regress/sbin/pfctl/pf15.ok
@@ -23,9 +23,4 @@ scrub in on lo0 inet6 from fe80::1 to any fragment reassemble
 scrub in inet from ! 127.0.0.1 to any fragment reassemble
 scrub in inet6 from ! ::1 to any fragment reassemble
 scrub in on lo0 inet6 from ! fe80::1 to any fragment reassemble
-scrub in inet from ! 127.0.0.1 to any fragment reassemble
-scrub in inet6 from ! ::1 to any fragment reassemble
-scrub in on lo0 inet6 from ! fe80::1 to any fragment reassemble
 scrub in on ! lo0 all fragment reassemble
-scrub in on ! lo all fragment reassemble
-scrub in from (lo:network) to (lo) fragment reassemble
diff --git a/regress/sbin/pfctl/pf25.loaded b/regress/sbin/pfctl/pf25.loaded
index 63928910ccd..488d10164e1 100644
--- a/regress/sbin/pfctl/pf25.loaded
+++ b/regress/sbin/pfctl/pf25.loaded
@@ -19,10 +19,18 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 block drop in on ! lo from (lo:network:2) to any
-  [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
+  [ Skip steps: d=end f=7 p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@6 block drop in log quick on ! lo inet from (lo:network:1) to any
+@6 block drop in from (lo:3) to any
+  [ Skip steps: d=end p=end sp=end da=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@7 block drop in log quick on ! lo inet from (lo:network:1) to any
+  [ Skip steps: d=end f=end p=end sp=end da=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@8 block drop in log quick inet from (lo:1) to any
   [ 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/pf25.ok b/regress/sbin/pfctl/pf25.ok
index 3ccb39f5c15..3f3f22c18b3 100644
--- a/regress/sbin/pfctl/pf25.ok
+++ b/regress/sbin/pfctl/pf25.ok
@@ -4,4 +4,6 @@ block drop in log quick on ! lo0 inet from 127.0.0.0/8 to any
 block drop in on ! lo0 from (lo0:network) to any
 block drop in log quick on ! lo0 inet from (lo0:network) to any
 block drop in on ! lo from (lo:network) to any
+block drop in from (lo) to any
 block drop in log quick on ! lo inet from (lo:network) to any
+block drop in log quick inet from (lo) to any
diff --git a/regress/sbin/pfctl/pfail21.in b/regress/sbin/pfctl/pfail21.in
deleted file mode 100644
index de61f76a61f..00000000000
--- a/regress/sbin/pfctl/pfail21.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# nonexistant interface in the dynamic case
-
-block inet from (nonexistant0)
diff --git a/regress/sbin/pfctl/pfail21.ok b/regress/sbin/pfctl/pfail21.ok
deleted file mode 100644
index 3928f52133e..00000000000
--- a/regress/sbin/pfctl/pfail21.ok
+++ /dev/null
@@ -1 +0,0 @@
-stdin:3: interface nonexistant0 does not exist
diff --git a/regress/sbin/pfctl/pfail22.in b/regress/sbin/pfctl/pfail22.in
deleted file mode 100644
index 0e23e921dcb..00000000000
--- a/regress/sbin/pfctl/pfail22.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#set loginterface to nonexistant one
-
-set loginterface gibsnich0
diff --git a/regress/sbin/pfctl/pfail22.ok b/regress/sbin/pfctl/pfail22.ok
deleted file mode 100644
index 3ce1fa97adf..00000000000
--- a/regress/sbin/pfctl/pfail22.ok
+++ /dev/null
@@ -1 +0,0 @@
-stdin:3: interface gibsnich0 doesn't exist