diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-04-05 21:47:58 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-04-05 21:47:58 +0000 |
| commit | 24d1733a1b6fb1a95a4ee4c4f008aba5e9a579b2 (patch) | |
| tree | 4c6ab3eebb681152f26038c447accdad899e2a2f /regress/sbin/pfctl | |
| parent | 2d255088e4ab91e33691e0ca58c93fd6d56da842 (diff) | |
test queue .. on $interface
Diffstat (limited to 'regress/sbin/pfctl')
| -rw-r--r-- | regress/sbin/pfctl/Makefile | 4 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfaltq8.in | 7 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfaltq8.ok | 16 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfaltq9.in | 8 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfaltq9.ok | 16 |
5 files changed, 49 insertions, 2 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile index 9ea6c2b47d5..12997aaa750 100644 --- a/regress/sbin/pfctl/Makefile +++ b/regress/sbin/pfctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.120 2003/04/03 14:20:09 henning Exp $ +# $OpenBSD: Makefile,v 1.121 2003/04/05 21:47:57 henning Exp $ # TARGETS # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok @@ -19,7 +19,7 @@ PFSIMPLE=1 2 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 60 -PFALTQ=1 2 3 4 5 6 7 +PFALTQ=1 2 3 4 5 6 7 8 9 # disabled; no altq in anchors # PFLOAD+=33 35 37 42 43 45 51 58 59 # disabled; no table def in anchors diff --git a/regress/sbin/pfctl/pfaltq8.in b/regress/sbin/pfctl/pfaltq8.in new file mode 100644 index 00000000000..1ca83b0f161 --- /dev/null +++ b/regress/sbin/pfctl/pfaltq8.in @@ -0,0 +1,7 @@ +# queuespec limited to interface(s) + +altq on { ppp0 ppp1 tun0 tun1 } priq bandwidth 10Mb queue { one two } +queue one priority 1 priq(default) +queue two on ppp0 priority 15 +queue two on { ppp1 tun0 tun1 } priority 0 + diff --git a/regress/sbin/pfctl/pfaltq8.ok b/regress/sbin/pfctl/pfaltq8.ok new file mode 100644 index 00000000000..1320b1f5522 --- /dev/null +++ b/regress/sbin/pfctl/pfaltq8.ok @@ -0,0 +1,16 @@ +queue one priq( default ) +[ qid=1 ifname=ppp0 ifbandwidth=10Mb ] +queue one priq( default ) +[ qid=1 ifname=ppp1 ifbandwidth=10Mb ] +queue one priq( default ) +[ qid=1 ifname=tun0 ifbandwidth=10Mb ] +queue one priq( default ) +[ qid=1 ifname=tun1 ifbandwidth=10Mb ] +queue two priority 15 +[ qid=2 ifname=ppp0 ifbandwidth=10Mb ] +queue two priority 0 +[ qid=2 ifname=ppp1 ifbandwidth=10Mb ] +queue two priority 0 +[ qid=2 ifname=tun0 ifbandwidth=10Mb ] +queue two priority 0 +[ qid=2 ifname=tun1 ifbandwidth=10Mb ] diff --git a/regress/sbin/pfctl/pfaltq9.in b/regress/sbin/pfctl/pfaltq9.in new file mode 100644 index 00000000000..97128b09d07 --- /dev/null +++ b/regress/sbin/pfctl/pfaltq9.in @@ -0,0 +1,8 @@ +# queuespec limited to interface(s): negation + +altq on { ppp0 ppp1 tun0 tun1 } priq bandwidth 10Mb queue { one two } +queue one priority 1 priq(default) +queue two on ppp0 priority 15 +queue two on ! ppp0 priority 0 + + diff --git a/regress/sbin/pfctl/pfaltq9.ok b/regress/sbin/pfctl/pfaltq9.ok new file mode 100644 index 00000000000..1320b1f5522 --- /dev/null +++ b/regress/sbin/pfctl/pfaltq9.ok @@ -0,0 +1,16 @@ +queue one priq( default ) +[ qid=1 ifname=ppp0 ifbandwidth=10Mb ] +queue one priq( default ) +[ qid=1 ifname=ppp1 ifbandwidth=10Mb ] +queue one priq( default ) +[ qid=1 ifname=tun0 ifbandwidth=10Mb ] +queue one priq( default ) +[ qid=1 ifname=tun1 ifbandwidth=10Mb ] +queue two priority 15 +[ qid=2 ifname=ppp0 ifbandwidth=10Mb ] +queue two priority 0 +[ qid=2 ifname=ppp1 ifbandwidth=10Mb ] +queue two priority 0 +[ qid=2 ifname=tun0 ifbandwidth=10Mb ] +queue two priority 0 +[ qid=2 ifname=tun1 ifbandwidth=10Mb ] |