diff options
Diffstat (limited to 'sbin/pfctl')
| -rw-r--r-- | sbin/pfctl/parse.y | 24 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl.c | 27 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_parser.h | 20 |
3 files changed, 52 insertions, 19 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index a6eab7ab1a2..4175d171f73 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.637 2014/08/21 15:09:27 mikeb Exp $ */ +/* $OpenBSD: parse.y,v 1.638 2014/08/23 00:11:03 pelikan Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -3454,14 +3454,36 @@ label : STRING { ; qname : STRING { + struct pfctl_qsitem *qsi; + + if ((qsi = pfctl_find_queue($1, &qspecs)) == NULL) { + yyerror("queue %s is not defined", $1); + YYERROR; + } $$.qname = $1; $$.pqname = NULL; } | '(' STRING ')' { + struct pfctl_qsitem *qsi; + + if ((qsi = pfctl_find_queue($2, &qspecs)) == NULL) { + yyerror("queue %s is not defined", $2); + YYERROR; + } $$.qname = $2; $$.pqname = NULL; } | '(' STRING comma STRING ')' { + struct pfctl_qsitem *qsi, *pqsi; + + if ((qsi = pfctl_find_queue($2, &qspecs)) == NULL) { + yyerror("queue %s is not defined", $2); + YYERROR; + } + if ((pqsi = pfctl_find_queue($4, &qspecs)) == NULL) { + yyerror("queue %s is not defined", $4); + YYERROR; + } $$.qname = $2; $$.pqname = $4; } diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 37b2db0415a..3c4979a7223 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.325 2014/04/19 14:22:32 henning Exp $ */ +/* $OpenBSD: pfctl.c,v 1.326 2014/08/23 00:11:03 pelikan Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -227,6 +227,10 @@ static const char *optiopt_list[] = { "none", "basic", "profile", NULL }; +struct pf_qihead qspecs = TAILQ_HEAD_INITIALIZER(qspecs); +struct pf_qihead rootqs = TAILQ_HEAD_INITIALIZER(rootqs); + + void usage(void) { @@ -1104,9 +1108,6 @@ pfctl_ruleset_trans(struct pfctl *pf, char *path, struct pf_anchor *a) return (0); } -TAILQ_HEAD(qspecs, pfctl_qsitem) qspecs = TAILQ_HEAD_INITIALIZER(qspecs); -TAILQ_HEAD(rootqs, pfctl_qsitem) rootqs = TAILQ_HEAD_INITIALIZER(rootqs); - int pfctl_add_queue(struct pfctl *pf, struct pf_queuespec *q) { @@ -1130,6 +1131,18 @@ pfctl_add_queue(struct pfctl *pf, struct pf_queuespec *q) return (0); } +struct pfctl_qsitem * +pfctl_find_queue(char *what, struct pf_qihead *where) +{ + struct pfctl_qsitem *q; + + TAILQ_FOREACH(q, where, entries) + if (strcmp(q->qs.qname, what) == 0) + return (q); + + return (NULL); +} + u_int pfctl_find_childqs(struct pfctl_qsitem *qi) { @@ -1144,11 +1157,7 @@ pfctl_find_childqs(struct pfctl_qsitem *qi) if (++p->matches > 10000) errx(1, "pfctl_find_childqs: excessive matches, loop?"); - /* check wether a children with that name is already there */ - TAILQ_FOREACH(q, &qi->children, entries) - if (!strcmp(q->qs.qname, p->qs.qname)) - break; - if (q == NULL) { + if ((q = pfctl_find_queue(p->qs.qname, &qi->children)) == NULL) { /* insert */ if ((n = calloc(1, sizeof(*n))) == NULL) err(1, "calloc"); diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h index 9762c9b66a7..3b957b855e5 100644 --- a/sbin/pfctl/pfctl_parser.h +++ b/sbin/pfctl/pfctl_parser.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_parser.h,v 1.102 2014/04/19 14:22:32 henning Exp $ */ +/* $OpenBSD: pfctl_parser.h,v 1.103 2014/08/23 00:11:03 pelikan Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -192,6 +192,15 @@ struct pf_opt_rule { TAILQ_HEAD(pf_opt_queue, pf_opt_rule); +extern TAILQ_HEAD(pf_qihead, pfctl_qsitem) qspecs, rootqs; +struct pfctl_qsitem { + TAILQ_ENTRY(pfctl_qsitem) entries; + struct pf_queuespec qs; + struct pf_qihead children; + int matches; +}; + + int pfctl_rules(int, char *, int, int, char *, struct pfr_buffer *); int pfctl_optimize_ruleset(struct pfctl *, struct pf_ruleset *); int pf_opt_create_table(struct pfctl *, struct pf_opt_tbl *); @@ -218,6 +227,7 @@ int pfctl_load_anchors(int, struct pfctl *, struct pfr_buffer *); int pfctl_load_queues(struct pfctl *); int pfctl_add_queue(struct pfctl *, struct pf_queuespec *); +struct pfctl_qsitem * pfctl_find_queue(char *, struct pf_qihead *); void print_pool(struct pf_pool *, u_int16_t, u_int16_t, sa_family_t, int, int); void print_src_node(struct pf_src_node *, int); @@ -276,12 +286,4 @@ int append_addr(struct pfr_buffer *, char *, int); int append_addr_host(struct pfr_buffer *, struct node_host *, int, int); -TAILQ_HEAD(pf_qihead, pfctl_qsitem); -struct pfctl_qsitem { - TAILQ_ENTRY(pfctl_qsitem) entries; - struct pf_queuespec qs; - struct pf_qihead children; - int matches; -}; - #endif /* _PFCTL_PARSER_H_ */ |