Skip step optimization involving dynaddr, tables, no-route.

Optimisation should be done on theses rules.

4 files changed, 167 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 104cfbd6bd3..d11d0e8f81c 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.159 2003/07/11 09:21:00 cedric Exp $
+# $OpenBSD: Makefile,v 1.160 2003/07/19 14:18:09 cedric Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -13,14 +13,14 @@
 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
+PFTESTS+=74 75 76 77 78 79 80 81
 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 33 34 35 36 37 38 39 40 41 42 43
 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
 PFLOAD+=30 31 32 34 36 38 39 40 44 46 47 48 49 54 56 60 61 65 66 67 68 69 70 71
-PFLOAD+=72 73 74 75 76 77 78 79 80
+PFLOAD+=72 73 74 75 76 77 78 79 80 81
 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
diff --git a/regress/sbin/pfctl/pf81.in b/regress/sbin/pfctl/pf81.in
new file mode 100644
index 00000000000..ac25c49dc65
--- /dev/null
+++ b/regress/sbin/pfctl/pf81.in
@@ -0,0 +1,12 @@
+# skip step optimization involving dynaddr, tables, no-route
+# optimisation should be done on theses rules
+
+ip_list="{ ::1 ::2 ::3 0.0.0.1 0.0.0.2 0.0.0.3 }"
+table_list="{ <bar1> <bar2> <bar3> }"
+pass from (lo0) to $ip_list
+pass from <foo> to $table_list
+pass from <foo> to $ip_list
+pass from <foo> to $table_list
+pass from no-route to $table_list
+pass from no-route to $ip_list
+pass from no-route to $table_list
diff --git a/regress/sbin/pfctl/pf81.loaded b/regress/sbin/pfctl/pf81.loaded
new file mode 100644
index 00000000000..bd47b132d59
--- /dev/null
+++ b/regress/sbin/pfctl/pf81.loaded
@@ -0,0 +1,120 @@
+@0 pass inet6 from (lo0) to ::1 
+  [ Skip steps: i=end d=end f=3 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@1 pass inet6 from (lo0) to ::2 
+  [ Skip steps: i=end d=end f=3 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@2 pass inet6 from (lo0) to ::3 
+  [ Skip steps: i=end d=end p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@3 pass inet from (lo0) to 0.0.0.1 
+  [ Skip steps: i=end d=end f=6 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@4 pass inet from (lo0) to 0.0.0.2 
+  [ Skip steps: i=end d=end f=6 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@5 pass inet from (lo0) to 0.0.0.3 
+  [ Skip steps: i=end d=end p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@6 pass from <foo:*> to <bar1:*> 
+  [ Skip steps: i=end d=end f=9 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@7 pass from <foo:*> to <bar2:*> 
+  [ Skip steps: i=end d=end f=9 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@8 pass from <foo:*> to <bar3:*> 
+  [ Skip steps: i=end d=end p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@9 pass inet6 from <foo:*> to ::1 
+  [ Skip steps: i=end d=end f=12 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@10 pass inet6 from <foo:*> to ::2 
+  [ Skip steps: i=end d=end f=12 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@11 pass inet6 from <foo:*> to ::3 
+  [ Skip steps: i=end d=end p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@12 pass inet from <foo:*> to 0.0.0.1 
+  [ Skip steps: i=end 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     ]
+@13 pass inet from <foo:*> to 0.0.0.2 
+  [ Skip steps: i=end 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 pass inet from <foo:*> to 0.0.0.3 
+  [ Skip steps: i=end d=end p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@15 pass from <foo:*> to <bar1:*> 
+  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@16 pass from <foo:*> to <bar2:*> 
+  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@17 pass from <foo:*> to <bar3:*> 
+  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@18 pass from no-route to <bar1:*> 
+  [ Skip steps: i=end d=end f=21 p=end sa=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@19 pass from no-route to <bar2:*> 
+  [ Skip steps: i=end d=end f=21 p=end sa=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@20 pass from no-route to <bar3:*> 
+  [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@21 pass inet6 from no-route to ::1 
+  [ Skip steps: i=end d=end f=24 p=end sa=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@22 pass inet6 from no-route to ::2 
+  [ Skip steps: i=end d=end f=24 p=end sa=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@23 pass inet6 from no-route to ::3 
+  [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@24 pass inet from no-route to 0.0.0.1 
+  [ Skip steps: i=end d=end f=27 p=end sa=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@25 pass inet from no-route to 0.0.0.2 
+  [ Skip steps: i=end d=end f=27 p=end sa=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@26 pass inet from no-route to 0.0.0.3 
+  [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@27 pass from no-route to <bar1:*> 
+  [ 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     ]
+@28 pass from no-route to <bar2:*> 
+  [ 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     ]
+@29 pass from no-route to <bar3:*> 
+  [ 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/pf81.ok b/regress/sbin/pfctl/pf81.ok
new file mode 100644
index 00000000000..6d78ebd82f6
--- /dev/null
+++ b/regress/sbin/pfctl/pf81.ok
@@ -0,0 +1,32 @@
+ip_list = "{ ::1 ::2 ::3 0.0.0.1 0.0.0.2 0.0.0.3 }"
+table_list = "{ <bar1> <bar2> <bar3> }"
+pass inet6 from (lo0) to ::1 
+pass inet6 from (lo0) to ::2 
+pass inet6 from (lo0) to ::3 
+pass inet from (lo0) to 0.0.0.1 
+pass inet from (lo0) to 0.0.0.2 
+pass inet from (lo0) to 0.0.0.3 
+pass from <foo> to <bar1> 
+pass from <foo> to <bar2> 
+pass from <foo> to <bar3> 
+pass inet6 from <foo> to ::1 
+pass inet6 from <foo> to ::2 
+pass inet6 from <foo> to ::3 
+pass inet from <foo> to 0.0.0.1 
+pass inet from <foo> to 0.0.0.2 
+pass inet from <foo> to 0.0.0.3 
+pass from <foo> to <bar1> 
+pass from <foo> to <bar2> 
+pass from <foo> to <bar3> 
+pass from no-route to <bar1> 
+pass from no-route to <bar2> 
+pass from no-route to <bar3> 
+pass inet6 from no-route to ::1 
+pass inet6 from no-route to ::2 
+pass inet6 from no-route to ::3 
+pass inet from no-route to 0.0.0.1 
+pass inet from no-route to 0.0.0.2 
+pass inet from no-route to 0.0.0.3 
+pass from no-route to <bar1> 
+pass from no-route to <bar2> 
+pass from no-route to <bar3>