diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-05-17 02:04:25 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-05-17 02:04:25 +0000 |
| commit | 7a778afb5d5fab5cad1d41caa02cb0e95af53af5 (patch) | |
| tree | a80aa7324ca03737de1b26467a7ebb8391d23fed | |
| parent | 06324f79034792c76ddcf45c1b4f0ea8c20a4f76 (diff) | |
support inverse matching on tags like
block in ! tagged sometag
ok dhartmei@ pb@
| -rw-r--r-- | sbin/pfctl/parse.y | 9 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_parser.c | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 4ba5bed97b6..573f12112d2 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.384 2003/05/16 17:15:17 dhartmei Exp $ */ +/* $OpenBSD: parse.y,v 1.385 2003/05/17 02:04:24 henning Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -171,6 +171,7 @@ struct filter_opts { struct node_qassign queues; char *tag; char *match_tag; + u_int8_t match_tag_not; } filter_opts; struct antispoof_opts { @@ -1297,6 +1298,7 @@ pfrule : action dir logquick interface route af proto fromto PF_TAG_NAME_SIZE - 1); YYERROR; } + r.match_tag_not = $9.match_tag_not; r.flags = $9.flags.b1; r.flagset = $9.flags.b2; if (rule_label(&r, $9.label)) @@ -1489,8 +1491,9 @@ filter_opt : USER uids { | TAG string { filter_opts.tag = $2; } - | TAGGED string { - filter_opts.match_tag = $2; + | not TAGGED string { + filter_opts.match_tag = $3; + filter_opts.match_tag_not = $1; } ; diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 96cb1e496e5..ed4a713917b 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_parser.c,v 1.157 2003/05/16 17:15:17 dhartmei Exp $ */ +/* $OpenBSD: pfctl_parser.c,v 1.158 2003/05/17 02:04:24 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -747,8 +747,11 @@ print_rule(struct pf_rule *r, int verbose) printf("queue %s ", r->qname); if (r->tagname[0]) printf("tag %s ", r->tagname); - if (r->match_tagname[0]) + if (r->match_tagname[0]) { + if (r->match_tag_not) + printf("! "); printf("tagged %s ", r->match_tagname); + } if (!r->anchorname[0] && (r->action == PF_NAT || r->action == PF_BINAT || r->action == PF_RDR)) { printf("-> "); |