diff options
| author | Daniel Hartmeier <dhartmei@cvs.openbsd.org> | 2004-06-10 14:22:55 +0000 |
|---|---|---|
| committer | Daniel Hartmeier <dhartmei@cvs.openbsd.org> | 2004-06-10 14:22:55 +0000 |
| commit | 029e8948e82df60a161af1f9776c7ede732a6207 (patch) | |
| tree | c7ac861055b0902ad5dff4da0a9ce853c2d05808 /sbin | |
| parent | 823082bc23f082927ba04e7a9d76845537fb3209 (diff) | |
rename struct pf_rule_addr member 'not' to 'neg', as 'not' is a reserved
keyword in C++. ok henning@, cedric@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/pfctl/parse.y | 8 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_parser.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 5ab484e8ddf..316d472ed3a 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.454 2004/05/21 23:10:48 dhartmei Exp $ */ +/* $OpenBSD: parse.y,v 1.455 2004/06/10 14:22:54 dhartmei Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -3278,7 +3278,7 @@ binatrule : no BINAT natpass interface af proto FROM host TO ipspec tag YYERROR; memcpy(&binat.dst.addr, &$10->addr, sizeof(binat.dst.addr)); - binat.dst.not = $10->not; + binat.dst.neg = $10->not; free($10); } @@ -4212,12 +4212,12 @@ expand_rule(struct pf_rule *r, r->ifnot = interface->not; r->proto = proto->proto; r->src.addr = src_host->addr; - r->src.not = src_host->not; + r->src.neg = src_host->not; r->src.port[0] = src_port->port[0]; r->src.port[1] = src_port->port[1]; r->src.port_op = src_port->op; r->dst.addr = dst_host->addr; - r->dst.not = dst_host->not; + r->dst.neg = dst_host->not; r->dst.port[0] = dst_port->port[0]; r->dst.port[1] = dst_port->port[1]; r->dst.port_op = dst_port->op; diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index d6b7be97c49..af0974658dc 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_parser.c,v 1.200 2004/05/27 11:48:06 henning Exp $ */ +/* $OpenBSD: pfctl_parser.c,v 1.201 2004/06/10 14:22:54 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -364,13 +364,13 @@ print_fromto(struct pf_rule_addr *src, pf_osfp_t osfp, struct pf_rule_addr *dst, PF_AZERO(&src->addr.v.a.mask, AF_INET6) && PF_AZERO(&dst->addr.v.a.addr, AF_INET6) && PF_AZERO(&dst->addr.v.a.mask, AF_INET6) && - !src->not && !dst->not && + !src->neg && !dst->neg && !src->port_op && !dst->port_op && osfp == PF_OSFP_ANY) printf(" all"); else { printf(" from "); - if (src->not) + if (src->neg) printf("! "); print_addr(&src->addr, af, verbose); if (src->port_op) @@ -382,7 +382,7 @@ print_fromto(struct pf_rule_addr *src, pf_osfp_t osfp, struct pf_rule_addr *dst, sizeof(buf))); printf(" to "); - if (dst->not) + if (dst->neg) printf("! "); print_addr(&dst->addr, af, verbose); if (dst->port_op) |