diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-11-09 14:31:59 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-11-09 14:31:59 +0000 |
| commit | c5c1489c59403667d8dfe0805b5632c2154358eb (patch) | |
| tree | 640f9520a6d46b0da9630ef7da8e765dc5d76fe4 /sbin/pfctl/parse.y | |
| parent | e6d9c24a5da20e62271c02e62624d0f0a7264be0 (diff) | |
A few more places to be updated for the route pool change.
expanded version of a diff from Vadim Zhukov.
ok henning@ claudio@
Diffstat (limited to 'sbin/pfctl/parse.y')
| -rw-r--r-- | sbin/pfctl/parse.y | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 72e1033f656..ee20d3bd532 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.573 2009/10/28 20:11:01 jsg Exp $ */ +/* $OpenBSD: parse.y,v 1.574 2009/11/09 14:31:58 jsg Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -2009,9 +2009,9 @@ pfrule : action dir logquick interface af proto fromto YYERROR; } r.rt = $8.route.rt; - r.rdr.opts = $8.route.pool_opts; + r.route.opts = $8.route.pool_opts; if ($8.route.key != NULL) - memcpy(&r.rdr.key, $8.route.key, + memcpy(&r.route.key, $8.route.key, sizeof(struct pf_poolhashkey)); } if (r.rt && r.rt != PF_FASTROUTE) { @@ -2022,18 +2022,18 @@ pfrule : action dir logquick interface af proto fromto "matching address family found."); YYERROR; } - if ((r.rdr.opts & PF_POOL_TYPEMASK) == + if ((r.route.opts & PF_POOL_TYPEMASK) == PF_POOL_NONE && ($8.route.host->next != NULL || $8.route.host->addr.type == PF_ADDR_TABLE || DYNIF_MULTIADDR($8.route.host->addr))) - r.rdr.opts |= PF_POOL_ROUNDROBIN; - if ((r.rdr.opts & PF_POOL_TYPEMASK) != + r.route.opts |= PF_POOL_ROUNDROBIN; + if ((r.route.opts & PF_POOL_TYPEMASK) != PF_POOL_ROUNDROBIN && disallow_table($8.route.host, "tables are only " "supported in round-robin routing pools")) YYERROR; - if ((r.rdr.opts & PF_POOL_TYPEMASK) != + if ((r.route.opts & PF_POOL_TYPEMASK) != PF_POOL_ROUNDROBIN && disallow_alias($8.route.host, "interface (%s) " @@ -2041,9 +2041,9 @@ pfrule : action dir logquick interface af proto fromto "routing pools")) YYERROR; if ($8.route.host->next != NULL) { - if ((r.rdr.opts & PF_POOL_TYPEMASK) != + if ((r.route.opts & PF_POOL_TYPEMASK) != PF_POOL_ROUNDROBIN) { - yyerror("r.rpool.opts must " + yyerror("r.route.opts must " "be PF_POOL_ROUNDROBIN"); YYERROR; } |