summaryrefslogtreecommitdiff
path: root/regress/sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-03-02 23:44:36 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-03-02 23:44:36 +0000
commitcb6de3e8d2699e838dcb4ca83d610baf152e7921 (patch)
tree752834c342956c809498aaa00b2762f303dec795 /regress/sbin
parent63113fed827d6abb3f26f9bbbe618ba04662adc0 (diff)
queue on two interfaces
Diffstat (limited to 'regress/sbin')
-rw-r--r--regress/sbin/pfctl/Makefile6
-rw-r--r--regress/sbin/pfctl/pf58.in8
-rw-r--r--regress/sbin/pfctl/pf58.ok6
3 files changed, 17 insertions, 3 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 0f1712cab71..5e5ba556998 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.104 2003/03/02 12:38:15 henning Exp $
+# $OpenBSD: Makefile,v 1.105 2003/03/02 23:44:35 henning Exp $
# TARGETS
# pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -12,7 +12,7 @@
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
+PFTESTS+=51 52 53 54 55 56 57 58
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
PFSIMPLE=1 2
@@ -20,7 +20,7 @@ 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
# disabled; no altq in anchors
-# PFLOAD+=33 35 37 42 43 45 51
+# PFLOAD+=33 35 37 42 43 45 51 58
# disabled; no table def in anchors
# PFLOAD+=48
# only testing parser, load test would be useless
diff --git a/regress/sbin/pfctl/pf58.in b/regress/sbin/pfctl/pf58.in
new file mode 100644
index 00000000000..43a5d09e64b
--- /dev/null
+++ b/regress/sbin/pfctl/pf58.in
@@ -0,0 +1,8 @@
+# queue on two interfaces
+
+altq on ppp0 bandwidth 100Kb cbq queue { std ssh }
+altq on lo0 bandwidth 10Mb cbq queue { blah ssh }
+queue std bandwidth 10% cbq(borrow, default)
+queue ssh bandwidth 30% cbq(borrow) { ssh2 }
+queue ssh2 bandwidth 80%
+queue blah cbq(default)
diff --git a/regress/sbin/pfctl/pf58.ok b/regress/sbin/pfctl/pf58.ok
new file mode 100644
index 00000000000..6ca721da9c5
--- /dev/null
+++ b/regress/sbin/pfctl/pf58.ok
@@ -0,0 +1,6 @@
+altq on ppp0 cbq bandwidth 100.00Kb tbrsize 1500 queue { std ssh }
+altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { blah ssh }
+queue std bandwidth 10% cbq( borrow default )
+queue ssh bandwidth 30% cbq( borrow ) { ssh2 }
+queue ssh2 bandwidth 80%
+queue blah cbq( default )