Test for <port_a>:<port_b> syntax outside of rdr.

6 files changed, 250 insertions, 163 deletions

diff --git a/regress/sbin/pfctl/pf4.in b/regress/sbin/pfctl/pf4.in
index 6f26a4fafdd..dcd6ee916b3 100644
--- a/regress/sbin/pfctl/pf4.in
+++ b/regress/sbin/pfctl/pf4.in
@@ -8,8 +8,9 @@ block in from ! 10.0.0.0/8 to any
 block in from { 10.0.0.0/8, 172.16.0.0/12 } to any
 
 block in proto tcp from any port = ssh to any
-block in proto tcp from any port { ssh, ftp >< 2048, != 1234, >= www } to any
+block in proto tcp from any port { ssh, ftp >< 2048, != 1234, >= www } \
+	to any port 1024:2048
 
 block in proto { tcp, udp } from { 10.0.0.0/8, 172.16.0.0/12 } port { ssh, ftp } \
-	to { 192.168.0.0/16, 12.34.56.78 } port { 6667, 6668 }
+	to { 192.168.0.0/16, 12.34.56.78 } port { 6667, 6668, 6669:65535 }
 
diff --git a/regress/sbin/pfctl/pf4.loaded b/regress/sbin/pfctl/pf4.loaded
index 5500cb1a19e..322ffafde1f 100644
--- a/regress/sbin/pfctl/pf4.loaded
+++ b/regress/sbin/pfctl/pf4.loaded
@@ -1,184 +1,248 @@
 @0 block drop in all
-  [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ]
+  [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in proto tcp all
-  [ Skip steps: i=end d=end f=5 p=3 sa=5 sp=9 da=14 dp=14 ]
+  [ Skip steps: i=end d=end f=5 p=3 sa=5 sp=9 da=14 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block drop in proto tcp all
-  [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ]
+  [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block drop in proto udp all
-  [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ]
+  [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block drop in all
-  [ Skip steps: i=end d=end p=9 sp=9 da=14 dp=14 ]
+  [ Skip steps: i=end d=end p=9 sp=9 da=14 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 block drop in inet from 10.0.0.0/8 to any
-  [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=14 ]
+  [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 block drop in inet from ! 10.0.0.0/8 to any
-  [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=14 ]
+  [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 block drop in inet from 10.0.0.0/8 to any
-  [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=14 ]
+  [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 block drop in inet from 172.16.0.0/12 to any
-  [ Skip steps: i=end d=end da=14 dp=14 ]
+  [ Skip steps: i=end d=end da=14 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 block drop in proto tcp from any port = ssh to any
-  [ Skip steps: i=end d=end f=14 p=30 sa=14 sp=11 da=14 dp=14 ]
+  [ Skip steps: i=end d=end f=14 p=38 sa=14 sp=11 da=14 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@10 block drop in proto tcp from any port = ssh to any
-  [ Skip steps: i=end d=end f=14 p=30 sa=14 da=14 dp=14 ]
+@10 block drop in proto tcp from any port = ssh to any port 1024:2048
+  [ Skip steps: i=end d=end f=14 p=38 sa=14 da=14 dp=14 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@11 block drop in proto tcp from any port 21 >< 2048 to any
-  [ Skip steps: i=end d=end f=14 p=30 sa=14 da=14 dp=14 ]
+@11 block drop in proto tcp from any port 21 >< 2048 to any port 1024:2048
+  [ Skip steps: i=end d=end f=14 p=38 sa=14 da=14 dp=14 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@12 block drop in proto tcp from any port != 1234 to any
-  [ Skip steps: i=end d=end f=14 p=30 sa=14 da=14 dp=14 ]
+@12 block drop in proto tcp from any port != 1234 to any port 1024:2048
+  [ Skip steps: i=end d=end f=14 p=38 sa=14 da=14 dp=14 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@13 block drop in proto tcp from any port >= 80 to any
-  [ Skip steps: i=end d=end p=30 ]
+@13 block drop in proto tcp from any port >= 80 to any port 1024:2048
+  [ Skip steps: i=end d=end p=38 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end d=end f=end p=30 sa=22 sp=18 da=16 ]
+  [ Skip steps: i=end d=end f=end p=38 sa=26 sp=20 da=17 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end d=end f=end p=30 sa=22 sp=18 ]
+  [ Skip steps: i=end d=end f=end p=38 sa=26 sp=20 da=17 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@16 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667
-  [ Skip steps: i=end d=end f=end p=30 sa=22 sp=18 da=18 ]
+@16 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=38 sa=26 sp=20 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@17 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668
-  [ Skip steps: i=end d=end f=end p=30 sa=22 ]
+@17 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667
+  [ Skip steps: i=end d=end f=end p=38 sa=26 sp=20 da=20 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@18 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end d=end f=end p=30 sa=22 sp=22 da=20 ]
+@18 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668
+  [ Skip steps: i=end d=end f=end p=38 sa=26 sp=20 da=20 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@19 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end d=end f=end p=30 sa=22 sp=22 ]
+@19 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=38 sa=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@20 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667
-  [ Skip steps: i=end d=end f=end p=30 sa=22 sp=22 da=22 ]
+@20 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667
+  [ Skip steps: i=end d=end f=end p=38 sa=26 sp=26 da=23 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@21 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668
-  [ Skip steps: i=end d=end f=end p=30 ]
+@21 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668
+  [ Skip steps: i=end d=end f=end p=38 sa=26 sp=26 da=23 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@22 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end d=end f=end p=30 sa=30 sp=26 da=24 ]
+@22 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=38 sa=26 sp=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@23 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end d=end f=end p=30 sa=30 sp=26 ]
+@23 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667
+  [ Skip steps: i=end d=end f=end p=38 sa=26 sp=26 da=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@24 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667
-  [ Skip steps: i=end d=end f=end p=30 sa=30 sp=26 da=26 ]
+@24 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668
+  [ Skip steps: i=end d=end f=end p=38 sa=26 sp=26 da=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@25 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668
-  [ Skip steps: i=end d=end f=end p=30 sa=30 ]
+@25 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=38 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@26 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end d=end f=end p=30 sa=30 sp=30 da=28 ]
+@26 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667
+  [ Skip steps: i=end d=end f=end p=38 sa=38 sp=32 da=29 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@27 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end d=end f=end p=30 sa=30 sp=30 ]
+@27 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668
+  [ Skip steps: i=end d=end f=end p=38 sa=38 sp=32 da=29 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@28 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667
-  [ Skip steps: i=end d=end f=end p=30 sa=30 sp=30 da=30 ]
+@28 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=38 sa=38 sp=32 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@29 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668
+@29 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667
+  [ Skip steps: i=end d=end f=end p=38 sa=38 sp=32 da=32 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@30 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668
+  [ Skip steps: i=end d=end f=end p=38 sa=38 sp=32 da=32 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@31 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=38 sa=38 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@32 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667
+  [ Skip steps: i=end d=end f=end p=38 sa=38 sp=38 da=35 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@33 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668
+  [ Skip steps: i=end d=end f=end p=38 sa=38 sp=38 da=35 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@34 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=38 sa=38 sp=38 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@35 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667
+  [ Skip steps: i=end d=end f=end p=38 sa=38 sp=38 da=38 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@36 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668
+  [ Skip steps: i=end d=end f=end p=38 sa=38 sp=38 da=38 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@37 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port 6669:65535
   [ Skip steps: i=end d=end f=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@30 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end d=end f=end p=end sa=38 sp=34 da=32 ]
+@38 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667
+  [ Skip steps: i=end d=end f=end p=end sa=50 sp=44 da=41 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@31 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end d=end f=end p=end sa=38 sp=34 ]
+@39 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668
+  [ Skip steps: i=end d=end f=end p=end sa=50 sp=44 da=41 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@32 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667
-  [ Skip steps: i=end d=end f=end p=end sa=38 sp=34 da=34 ]
+@40 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=end sa=50 sp=44 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@33 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668
-  [ Skip steps: i=end d=end f=end p=end sa=38 ]
+@41 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667
+  [ Skip steps: i=end d=end f=end p=end sa=50 sp=44 da=44 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@34 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end d=end f=end p=end sa=38 sp=38 da=36 ]
+@42 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668
+  [ Skip steps: i=end d=end f=end p=end sa=50 sp=44 da=44 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@35 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end d=end f=end p=end sa=38 sp=38 ]
+@43 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=end sa=50 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@36 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end d=end f=end p=end sa=38 sp=38 da=38 ]
+@44 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667
+  [ Skip steps: i=end d=end f=end p=end sa=50 sp=50 da=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@37 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668
+@45 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668
+  [ Skip steps: i=end d=end f=end p=end sa=50 sp=50 da=47 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@46 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=end sa=50 sp=50 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@47 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667
+  [ Skip steps: i=end d=end f=end p=end sa=50 sp=50 da=50 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@48 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668
+  [ Skip steps: i=end d=end f=end p=end sa=50 sp=50 da=50 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@49 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port 6669:65535
   [ Skip steps: i=end d=end f=end p=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@38 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end d=end f=end p=end sa=end sp=42 da=40 ]
+@50 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667
+  [ Skip steps: i=end d=end f=end p=end sa=end sp=56 da=53 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@51 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668
+  [ Skip steps: i=end d=end f=end p=end sa=end sp=56 da=53 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@52 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535
+  [ Skip steps: i=end d=end f=end p=end sa=end sp=56 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@39 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end d=end f=end p=end sa=end sp=42 ]
+@53 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667
+  [ Skip steps: i=end d=end f=end p=end sa=end sp=56 da=56 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@40 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667
-  [ Skip steps: i=end d=end f=end p=end sa=end sp=42 da=42 ]
+@54 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668
+  [ Skip steps: i=end d=end f=end p=end sa=end sp=56 da=56 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@41 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668
+@55 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535
   [ Skip steps: i=end d=end f=end p=end sa=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@42 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=44 ]
+@56 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667
+  [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=59 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@57 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668
+  [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@43 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668
+@58 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port 6669:65535
   [ Skip steps: i=end d=end f=end p=end sa=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@44 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667
+@59 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667
+  [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@60 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668
   [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@45 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668
+@61 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port 6669:65535
   [ 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/pf4.ok b/regress/sbin/pfctl/pf4.ok
index 9a4cb54e8cc..37c515c0985 100644
--- a/regress/sbin/pfctl/pf4.ok
+++ b/regress/sbin/pfctl/pf4.ok
@@ -8,39 +8,55 @@ block drop in inet from ! 10.0.0.0/8 to any
 block drop in inet from 10.0.0.0/8 to any
 block drop in inet from 172.16.0.0/12 to any
 block drop in proto tcp from any port = ssh to any
-block drop in proto tcp from any port = ssh to any
-block drop in proto tcp from any port 21 >< 2048 to any
-block drop in proto tcp from any port != 1234 to any
-block drop in proto tcp from any port >= 80 to any
+block drop in proto tcp from any port = ssh to any port 1024:2048
+block drop in proto tcp from any port 21 >< 2048 to any port 1024:2048
+block drop in proto tcp from any port != 1234 to any port 1024:2048
+block drop in proto tcp from any port >= 80 to any port 1024:2048
 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667
 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668
+block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535
 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667
 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668
+block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535
 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667
 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668
+block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port 6669:65535
 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667
 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668
+block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port 6669:65535
 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667
 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668
+block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535
 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667
 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668
+block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535
 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667
 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668
+block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port 6669:65535
 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667
 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668
+block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port 6669:65535
 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667
 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668
+block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535
 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667
 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668
+block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535
 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667
 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668
+block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port 6669:65535
 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667
 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668
+block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port 6669:65535
 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667
 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668
+block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535
 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667
 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668
+block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535
 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667
 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668
+block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port 6669:65535
 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667
 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668
+block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port 6669:65535
diff --git a/regress/sbin/pfctl/pf47.in b/regress/sbin/pfctl/pf47.in
index 04901c68625..0fcfa14ebb3 100644
--- a/regress/sbin/pfctl/pf47.in
+++ b/regress/sbin/pfctl/pf47.in
@@ -37,6 +37,7 @@ pass in on lo0 all label "x$srcportx"
 pass in on lo0 proto tcp from any port = 28 to any label "$srcport"
 pass in on lo0 proto tcp from any port 28 >< 29 to any label "$srcport"
 pass in on lo0 proto tcp from any port 28 <> 29 to any label "$srcport"
+pass in on lo0 proto tcp from any port 28:29 to any label "$srcport"
 pass in on lo0 proto tcp from any port != 28 to any label "$srcport"
 pass in on lo0 proto tcp from any port < 28 to any label "$srcport"
 pass in on lo0 proto tcp from any port <= 28 to any label "$srcport"
diff --git a/regress/sbin/pfctl/pf47.loaded b/regress/sbin/pfctl/pf47.loaded
index bf8cc34acb2..964ce21fa01 100644
--- a/regress/sbin/pfctl/pf47.loaded
+++ b/regress/sbin/pfctl/pf47.loaded
@@ -1,240 +1,244 @@
 @0 pass in on lo0 all
-  [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
+  [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in all label "any"
-  [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
+  [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in on lo0 all label "lo0"
-  [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in on lo0 all label "lo0lo0"
-  [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in on lo0 all label "any"
-  [ Skip steps: i=end d=end p=35 sa=6 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end p=35 sa=6 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in on lo0 inet all label "any"
-  [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in on lo0 inet from 127.0.0.1 to any label "127.0.0.1"
-  [ Skip steps: i=end d=end f=12 p=35 sa=9 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=12 p=35 sa=9 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass in on lo0 inet from 127.0.0.1 to any label "127.0.0.1127.0.0.1"
-  [ Skip steps: i=end d=end f=12 p=35 sa=9 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=12 p=35 sa=9 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass in on lo0 inet from 127.0.0.1 to any label ":127.0.0.1:127.0.0.1:"
-  [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass in on lo0 inet from 127.0.0.0/8 to any label "127.0.0.0/8"
-  [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass in on lo0 inet from 127.0.0.0/16 to any label "127.0.0.0/16127.0.0.0/16"
-  [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass in on lo0 inet from 127.0.0.0/31 to any label ":127.0.0.0/31:127.0.0.0/31:"
-  [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 pass in on lo0 inet6 from fe80::1 to any label "fe80::1"
-  [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass in on lo0 inet6 from fe80::1 to any label "fe80::1fe80::1"
-  [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 pass in on lo0 inet6 from fe80::1 to any label ":fe80::1:fe80::1:"
-  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 pass in on lo0 inet6 from ::/8 to any label "::/8"
-  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 pass in on lo0 inet6 from fe00::/8 to any label "fe00::/8"
-  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 pass in on lo0 inet6 from ::/64 to any label "::/64::/64"
-  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 pass in on lo0 inet6 from fe80::/64 to any label "fe80::/64fe80::/64"
-  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 pass in on lo0 inet6 from ::/127 to any label ":::/127:::/127:"
-  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 pass in on lo0 inet6 from fe80::/127 to any label ":fe80::/127:fe80::/127:"
-  [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=46 ]
+  [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 pass in on lo0 all label "!any!"
-  [ Skip steps: i=end d=end p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 pass in on lo0 inet from any to (lo0) label "(lo0)"
-  [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 da=25 dp=46 ]
+  [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 da=25 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 pass in on lo0 inet from any to (lo0) label "(lo0)(lo0)"
-  [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 da=25 dp=46 ]
+  [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 da=25 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 pass in on lo0 inet from any to (lo0) label " (lo0) (lo0) "
-  [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @25 pass in on lo0 inet from any to ! 127.0.0.0/8 label "! 127.0.0.0/8"
-  [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @26 pass in on lo0 inet from any to ! 127.0.0.0/16 label "! 127.0.0.0/16! 127.0.0.0/16"
-  [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @27 pass in on lo0 inet from any to ! 127.0.0.0/31 label " ! 127.0.0.0/31 ! 127.0.0.0/31 "
-  [ Skip steps: i=end d=end p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @28 pass in on lo0 inet6 from any to ! (lo0) label "! (lo0)"
-  [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 da=31 dp=46 ]
+  [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 da=31 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @29 pass in on lo0 inet6 from any to ! (lo0) label "! (lo0)! (lo0)"
-  [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 da=31 dp=46 ]
+  [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 da=31 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @30 pass in on lo0 inet6 from any to ! (lo0) label " ! (lo0) ! (lo0) "
-  [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @31 pass in on lo0 inet6 from any to ! ::/8 label "! ::/8"
-  [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @32 pass in on lo0 inet6 from any to ! ::/64 label "! ::/64! ::/64"
-  [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @33 pass in on lo0 inet6 from any to ! ::/127 label " ! ::/127 ! ::/127 "
-  [ Skip steps: i=end d=end p=35 sa=59 sp=35 dp=46 ]
+  [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @34 pass in on lo0 all label "xx"
-  [ Skip steps: i=end d=end f=59 sa=59 da=59 dp=46 ]
+  [ Skip steps: i=end d=end f=60 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @35 pass in on lo0 proto tcp from any port = 28 to any label "28"
-  [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+  [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @36 pass in on lo0 proto tcp from any port 28 >< 29 to any label "28><29"
-  [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+  [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @37 pass in on lo0 proto tcp from any port 28 <> 29 to any label "28<>29"
-  [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+  [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@38 pass in on lo0 proto tcp from any port != 28 to any label "!=28"
-  [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+@38 pass in on lo0 proto tcp from any port 28:29 to any
+  [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@39 pass in on lo0 proto tcp from any port < 28 to any label "<28"
-  [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+@39 pass in on lo0 proto tcp from any port != 28 to any label "!=28"
+  [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@40 pass in on lo0 proto tcp from any port <= 28 to any label "<=28"
-  [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+@40 pass in on lo0 proto tcp from any port < 28 to any label "<28"
+  [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@41 pass in on lo0 proto tcp from any port > 28 to any label ">28"
-  [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+@41 pass in on lo0 proto tcp from any port <= 28 to any label "<=28"
+  [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@42 pass in on lo0 proto tcp from any port >= 28 to any label ">=28"
-  [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+@42 pass in on lo0 proto tcp from any port > 28 to any label ">28"
+  [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@43 pass in on lo0 proto tcp from any port = 28 to any label "2828"
-  [ Skip steps: i=end d=end f=59 p=45 sa=59 sp=45 da=59 dp=46 ]
+@43 pass in on lo0 proto tcp from any port >= 28 to any label ">=28"
+  [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@44 pass in on lo0 proto tcp from any port = 28 to any label "$28$28$"
-  [ Skip steps: i=end d=end f=59 sa=59 da=59 dp=46 ]
+@44 pass in on lo0 proto tcp from any port = 28 to any label "2828"
+  [ Skip steps: i=end d=end f=60 p=46 sa=60 sp=46 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@45 pass in on lo0 all
-  [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 ]
+@45 pass in on lo0 proto tcp from any port = 28 to any label "$28$28$"
+  [ Skip steps: i=end d=end f=60 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@46 pass in on lo0 proto udp from any to any port = 29 label "29"
-  [ Skip steps: i=end d=end f=59 p=49 sa=59 sp=59 da=59 ]
+@46 pass in on lo0 all
+  [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@47 pass in on lo0 proto udp from any to any port != 29 label "!=29!=29"
-  [ Skip steps: i=end d=end f=59 p=49 sa=59 sp=59 da=59 ]
+@47 pass in on lo0 proto udp from any to any port = 29 label "29"
+  [ Skip steps: i=end d=end f=60 p=50 sa=60 sp=60 da=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@48 pass in on lo0 proto udp from any to any port > 29 label "x>29x>29x"
-  [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 ]
+@48 pass in on lo0 proto udp from any to any port != 29 label "!=29!=29"
+  [ Skip steps: i=end d=end f=60 p=50 sa=60 sp=60 da=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@49 pass in on lo0 all label "ip"
-  [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 dp=59 ]
+@49 pass in on lo0 proto udp from any to any port > 29 label "x>29x>29x"
+  [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@50 pass in on lo0 proto esp all label "esp"
-  [ Skip steps: i=end d=end f=59 p=53 sa=59 sp=59 da=59 dp=59 ]
+@50 pass in on lo0 all label "ip"
+  [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@51 pass in on lo0 proto esp all label "espesp"
-  [ Skip steps: i=end d=end f=59 p=53 sa=59 sp=59 da=59 dp=59 ]
+@51 pass in on lo0 proto esp all label "esp"
+  [ Skip steps: i=end d=end f=60 p=54 sa=60 sp=60 da=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@52 pass in on lo0 proto esp all label "-esp-esp-"
-  [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 dp=59 ]
+@52 pass in on lo0 proto esp all label "espesp"
+  [ Skip steps: i=end d=end f=60 p=54 sa=60 sp=60 da=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@53 pass in on lo0 proto 166 all label "166"
-  [ Skip steps: i=end d=end f=59 p=56 sa=59 sp=59 da=59 dp=59 ]
+@53 pass in on lo0 proto esp all label "-esp-esp-"
+  [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@54 pass in on lo0 proto 166 all label "166166"
-  [ Skip steps: i=end d=end f=59 p=56 sa=59 sp=59 da=59 dp=59 ]
+@54 pass in on lo0 proto 166 all label "166"
+  [ Skip steps: i=end d=end f=60 p=57 sa=60 sp=60 da=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@55 pass in on lo0 proto 166 all label "_166_166_"
-  [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 dp=59 ]
+@55 pass in on lo0 proto 166 all label "166166"
+  [ Skip steps: i=end d=end f=60 p=57 sa=60 sp=60 da=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@56 pass in on lo0 all label "56"
-  [ Skip steps: i=end d=end f=59 p=59 sa=59 sp=59 da=59 dp=59 ]
+@56 pass in on lo0 proto 166 all label "_166_166_"
+  [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@57 pass in on lo0 all label "5757"
-  [ Skip steps: i=end d=end f=59 p=59 sa=59 sp=59 da=59 dp=59 ]
+@57 pass in on lo0 all label "57"
+  [ Skip steps: i=end d=end f=60 p=60 sa=60 sp=60 da=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@58 pass in on lo0 all label "%58%58%"
+@58 pass in on lo0 all label "5858"
+  [ Skip steps: i=end d=end f=60 p=60 sa=60 sp=60 da=60 dp=60 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@59 pass in on lo0 all label "%59%59%"
   [ Skip steps: i=end d=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@59 pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 label "if lo0 proto tcp 127.0.0.1 30 127.0.0.2 44"
+@60 pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 label "if lo0 proto tcp 127.0.0.1 30 127.0.0.2 44"
   [ 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/pf47.ok b/regress/sbin/pfctl/pf47.ok
index 1bb211e7a71..a1e0485c5f1 100644
--- a/regress/sbin/pfctl/pf47.ok
+++ b/regress/sbin/pfctl/pf47.ok
@@ -36,6 +36,7 @@ pass in on lo0 all label "xx"
 pass in on lo0 proto tcp from any port = 28 to any label "28"
 pass in on lo0 proto tcp from any port 28 >< 29 to any label "28><29"
 pass in on lo0 proto tcp from any port 28 <> 29 to any label "28<>29"
+pass in on lo0 proto tcp from any port 28:29 to any
 pass in on lo0 proto tcp from any port != 28 to any label "!=28"
 pass in on lo0 proto tcp from any port < 28 to any label "<28"
 pass in on lo0 proto tcp from any port <= 28 to any label "<=28"
@@ -54,7 +55,7 @@ pass in on lo0 proto esp all label "-esp-esp-"
 pass in on lo0 proto 166 all label "166"
 pass in on lo0 proto 166 all label "166166"
 pass in on lo0 proto 166 all label "_166_166_"
-pass in on lo0 all label "56"
-pass in on lo0 all label "5757"
-pass in on lo0 all label "%58%58%"
+pass in on lo0 all label "57"
+pass in on lo0 all label "5858"
+pass in on lo0 all label "%59%59%"
 pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 label "if lo0 proto tcp 127.0.0.1 30 127.0.0.2 44"