diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2002-11-28 14:43:40 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2002-11-28 14:43:40 +0000 |
| commit | babb0aba425848be9ad1da43291b73c80d358a0d (patch) | |
| tree | 69eddef6afa276f52ed11c33da7e55cf1e7ee8d9 /sbin | |
| parent | 65f9355d0ac585a19d03404d0f77353140c5382f (diff) | |
allow qlimit on altq spec
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/pfctl/parse.y | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 7cf57b6b96b..1ca00846fb9 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.224 2002/11/28 12:14:24 mcbride Exp $ */ +/* $OpenBSD: parse.y,v 1.225 2002/11/28 14:43:39 henning Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -522,8 +522,8 @@ antispoof_iflst : if_item { $$ = $1; } /* altq stuff */ -altqif : ALTQ interface SCHEDULER schedtype bandwidth tbrsize - QUEUE qassign { +altqif : ALTQ interface SCHEDULER schedtype bandwidth qlimit + tbrsize QUEUE qassign { struct pf_altq a; if (check_rulestate(PFCTL_STATE_QUEUE)) @@ -540,12 +540,13 @@ altqif : ALTQ interface SCHEDULER schedtype bandwidth tbrsize yyerror("interface bandwidth must be absolute"); YYERROR; } - a.tbrsize = $6; - if ($8 == NULL) { + a.qlimit = $6; + a.tbrsize = $7; + if ($9 == NULL) { yyerror("no child queues specified"); YYERROR; } - if (expand_altq(&a, $2, $8)) + if (expand_altq(&a, $2, $9)) YYERROR; } ; |