diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-03-19 15:51:41 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-03-19 15:51:41 +0000 |
| commit | e2c9874e85696f30b6f8468bce9767263386cdf4 (patch) | |
| tree | b958570c15b588c6eb57407e87899e254a53d93b | |
| parent | 6468ae05bbdd9520d50e07e1c3dc556aa64f8082 (diff) | |
kill the address token and move the host() invocation up to the host token,
so that host() always gets the full address to be parsed including the
netmask instead of applying the netmask afterwards. this could break some
edge cases and was broken since the (interface)/24 fix.
new token dynaddr for, well, dynaddr, and apply an eventually given netmask
afterwards in the host token just in this case.
found after bug report From: Julien Bordet <zejames@greyhats.org> via dhartmei
ok daniel cedric
| -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 276b4b4154a..7d7035b6569 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.342 2003/03/10 14:50:29 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.343 2003/03/19 15:51:40 henning Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -375,7 +375,7 @@ typedef struct { %type <v.icmp> icmp6_list icmp6_item %type <v.fromto> fromto %type <v.peer> ipportspec from to -%type <v.host> ipspec xhost host address host_list +%type <v.host> ipspec xhost host dynaddr host_list %type <v.host> redir_host_list redirspec %type <v.host> route_host route_host_list routespec %type <v.port> portspec port_list port_item @@ -1555,8 +1555,10 @@ xhost : not host { } ; -host : address - | address '/' number { +host : STRING { $$ = host($1, -1); } + | STRING '/' number { $$ = host($1, $3); } + | dynaddr + | dynaddr '/' number { struct node_host *n; $$ = $1; @@ -1594,7 +1596,7 @@ number : STRING { } ; -address : '(' STRING ')' { +dynaddr : '(' STRING ')' { if (ifa_exists($2) == NULL) { yyerror("interface %s does not exist", $2); YYERROR; @@ -1615,7 +1617,6 @@ address : '(' STRING ')' { $$->next = NULL; $$->tail = $$; } - | STRING { $$ = host($1, -1); } ; portspec : port_item { $$ = $1; } |