Add a test for route labels, re PR6416. ok phessler@

5 files changed, 24 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index c64fd9b328d..b1b70aa4d27 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.211 2010/06/20 20:35:06 phessler Exp $
+# $OpenBSD: Makefile,v 1.212 2010/06/30 21:18:06 sthen Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check whether the output matches pfNN.ok
@@ -15,14 +15,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 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
-PFTESTS+=97 98
+PFTESTS+=97 98 99
 PFFAIL=1 2 3 4 5 6 7 8 11 12 13 14 15 16 17 18 19 20 23 25 27
 PFFAIL+=29 30 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 52 53
 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 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 81 82 84 87 88 89 90 91 92
+PFLOAD+=72 73 74 75 76 77 78 79 80 81 82 84 87 88 89 90 91 92 99
 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/pf99.in b/regress/sbin/pfctl/pf99.in
new file mode 100644
index 00000000000..0c0bfbde254
--- /dev/null
+++ b/regress/sbin/pfctl/pf99.in
@@ -0,0 +1,3 @@
+# basic route-label test
+pass from route "foo"
+pass to route "bar"
diff --git a/regress/sbin/pfctl/pf99.loaded b/regress/sbin/pfctl/pf99.loaded
new file mode 100644
index 00000000000..ece6740f446
--- /dev/null
+++ b/regress/sbin/pfctl/pf99.loaded
@@ -0,0 +1,8 @@
+@0 pass from route "foo" to any flags S/SA keep state
+  [ Skip steps: i=end 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     ]
+@1 pass from any to route "bar" flags S/SA keep state
+  [ 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/pf99.ok b/regress/sbin/pfctl/pf99.ok
new file mode 100644
index 00000000000..5c34286b085
--- /dev/null
+++ b/regress/sbin/pfctl/pf99.ok
@@ -0,0 +1,2 @@
+pass from route "foo" to any flags S/SA keep state
+pass from any to route "bar" flags S/SA keep state
diff --git a/regress/sbin/pfctl/pf99.optimized b/regress/sbin/pfctl/pf99.optimized
new file mode 100644
index 00000000000..ece6740f446
--- /dev/null
+++ b/regress/sbin/pfctl/pf99.optimized
@@ -0,0 +1,8 @@
+@0 pass from route "foo" to any flags S/SA keep state
+  [ Skip steps: i=end 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     ]
+@1 pass from any to route "bar" flags S/SA keep state
+  [ 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     ]