Test host list concatenation (fail today).

3 files changed, 45 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/pf15.in b/regress/sbin/pfctl/pf15.in
index 5554499f266..8f8b7dbe5d3 100644
--- a/regress/sbin/pfctl/pf15.in
+++ b/regress/sbin/pfctl/pf15.in
@@ -7,3 +7,5 @@ scrub in log on {lo0 lo1} from any to any
 scrub in on lo0 inet from (lo0) to any
 scrub in log on lo0 inet6 from { (lo1), (lo0) } to 2000::1
 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
diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded
index 70ee538004c..d57e7b137e4 100644
--- a/regress/sbin/pfctl/pf15.loaded
+++ b/regress/sbin/pfctl/pf15.loaded
@@ -39,18 +39,50 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 scrub in inet from 10.0.0.1 to 10.0.0.3 fragment reassemble 
-  [ Skip steps: i=end d=end f=end p=end sa=12 sp=end dp=end ]
+  [ Skip steps: i=16 d=end f=15 p=end sa=12 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 scrub in inet from 10.0.0.1 to 10.0.0.4 fragment reassemble 
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=16 d=end f=15 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 scrub in inet from 10.0.0.2 to 10.0.0.3 fragment reassemble 
-  [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=16 d=end f=15 p=end sa=14 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 scrub in inet from 10.0.0.2 to 10.0.0.4 fragment reassemble 
+  [ Skip steps: i=16 d=end f=15 p=end sp=end dp=end ]
+  [ 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=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=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=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=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=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=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=end 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: 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 9e4680f18d5..6cb7b7f5aa8 100644
--- a/regress/sbin/pfctl/pf15.ok
+++ b/regress/sbin/pfctl/pf15.ok
@@ -12,3 +12,11 @@ scrub in inet from 10.0.0.1 to 10.0.0.3 fragment reassemble
 scrub in inet from 10.0.0.1 to 10.0.0.4 fragment reassemble 
 scrub in inet from 10.0.0.2 to 10.0.0.3 fragment reassemble 
 scrub in inet from 10.0.0.2 to 10.0.0.4 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 10.1.1.1 to any fragment reassemble 
+scrub in inet from 10.0.0.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