summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2002-12-13 22:03:29 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2002-12-13 22:03:29 +0000
commitc1c9af601d83865083779973854d391f3f1ae356 (patch)
tree9149d7cd0bc40a2686ce835cdfef9f142831dab5
parente8b8a8307aff1cf21eafa8e2024c81f3431b9003 (diff)
test extended syntax for queue assignment on filter rules
-rw-r--r--regress/sbin/pfctl/Makefile4
-rw-r--r--regress/sbin/pfctl/pf43.in11
-rw-r--r--regress/sbin/pfctl/pf43.ok8
3 files changed, 21 insertions, 2 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index b4f48dd54a5..ab623ce26f5 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.54 2002/12/08 02:18:56 henning Exp $
+# $OpenBSD: Makefile,v 1.55 2002/12/13 22:03:28 henning Exp $
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
+PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
PFSIMPLE=1 2
PFSETUP=1
diff --git a/regress/sbin/pfctl/pf43.in b/regress/sbin/pfctl/pf43.in
new file mode 100644
index 00000000000..c8cb87910bf
--- /dev/null
+++ b/regress/sbin/pfctl/pf43.in
@@ -0,0 +1,11 @@
+#test various forms of queue assignment
+
+altq on lo0 bandwidth 100Mb cbq queue { bulk, prio }
+queue bulk priority 1 cbq(default)
+queue prio priority 7
+pass in on lo0 inet proto tcp from any to lo0 port 22 queue (bulk prio)
+pass in on lo0 inet proto tcp from any to lo0 port 22 queue bulk
+pass in on lo0 inet proto tcp from any to lo0 port 22 queue (bulk, prio)
+pass in on lo0 inet proto tcp from any to lo0 port 22 queue (bulk)
+pass in on lo0 inet proto tcp from any to lo0 port 22 queue(bulk prio)
+
diff --git a/regress/sbin/pfctl/pf43.ok b/regress/sbin/pfctl/pf43.ok
new file mode 100644
index 00000000000..5dc85d60e98
--- /dev/null
+++ b/regress/sbin/pfctl/pf43.ok
@@ -0,0 +1,8 @@
+altq on lo0 cbq bandwidth 100.00Mb tbrsize 3648 queue { bulk prio }
+queue bulk bandwidth 100.00Mb cbq( default )
+queue prio bandwidth 100.00Mb priority 7
+pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio)
+pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue bulk
+pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio)
+pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue bulk
+pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio)