test netmasks with multicast addresses

4 files changed, 56 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index a489e3ed641..b5929af662e 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.117 2003/03/11 15:26:44 henning Exp $
+# $OpenBSD: Makefile,v 1.118 2003/03/19 14:03:52 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
+PFTESTS+=51 52 53 54 55 56 57 58 59 60
 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
 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
+PFLOAD+=30 31 32 34 36 38 39 40 44 46 47 49 54 56 60
 PFALTQ=1 2 3 4 5 6
 # disabled; no altq in anchors
 # PFLOAD+=33 35 37 42 43 45 51 58 59
diff --git a/regress/sbin/pfctl/pf60.in b/regress/sbin/pfctl/pf60.in
new file mode 100644
index 00000000000..2824cfd301b
--- /dev/null
+++ b/regress/sbin/pfctl/pf60.in
@@ -0,0 +1,11 @@
+# netmask handling w/ multicast
+
+pass from 224.4.5.4/32
+pass from 224.4.5.4/16
+pass from 224.4.5.4/26
+pass from 224.4.5.65/26
+pass from 224.4.5.134/26
+pass from 224.4.5.199/26
+pass from 224.4.5.4
+
+
diff --git a/regress/sbin/pfctl/pf60.loaded b/regress/sbin/pfctl/pf60.loaded
new file mode 100644
index 00000000000..e5bad104965
--- /dev/null
+++ b/regress/sbin/pfctl/pf60.loaded
@@ -0,0 +1,35 @@
+@0 pass inet from 224.4.5.4 to any 
+[ Skip steps: i=end 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     ]
+
+@1 pass inet from 224.4.0.0/16 to any 
+[ Skip steps: i=end 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     ]
+
+@2 pass inet from 224.4.5.0/26 to any 
+[ Skip steps: i=end 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     ]
+
+@3 pass inet from 224.4.5.64/26 to any 
+[ Skip steps: i=end 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     ]
+
+@4 pass inet from 224.4.5.128/26 to any 
+[ Skip steps: i=end 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     ]
+
+@5 pass inet from 224.4.5.192/26 to any 
+[ Skip steps: i=end 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     ]
+
+@6 pass inet from 224.4.5.4 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/pf60.ok b/regress/sbin/pfctl/pf60.ok
new file mode 100644
index 00000000000..6a9aea6df87
--- /dev/null
+++ b/regress/sbin/pfctl/pf60.ok
@@ -0,0 +1,7 @@
+pass inet from 224.4.5.4 to any 
+pass inet from 224.4.0.0/16 to any 
+pass inet from 224.4.5.0/26 to any 
+pass inet from 224.4.5.64/26 to any 
+pass inet from 224.4.5.128/26 to any 
+pass inet from 224.4.5.192/26 to any 
+pass inet from 224.4.5.4 to any