d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach the ippool parser about address families. This is a precursor

Browse Source 
to implementing IPv6 support within ippool which requires reworking
radix_ipf.c.

MFC after:	1 month
This commit is contained in:
cy 2019-09-26 03:09:45 +00:00
parent e0d60d0aa2
commit ed7bf2816a
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/ipfilter/tools/ippool_y.y
View File

@ -309,11 +309,27 @@ range: addrmask { $$ = calloc(1, sizeof(*$$));
$$->ipn_info = 0; $$->ipn_info = 0;
$$->ipn_addr = $1[0]; $$->ipn_addr = $1[0];
$$->ipn_mask = $1[1]; $$->ipn_mask = $1[1];
#ifdef USE_INET6
if (use_inet6)
$$->ipn_addr.adf_family =
AF_INET6;
else
#endif
$$->ipn_addr.adf_family =
AF_INET;
} }
| '!' addrmask { $$ = calloc(1, sizeof(*$$)); | '!' addrmask { $$ = calloc(1, sizeof(*$$));
$$->ipn_info = 1; $$->ipn_info = 1;
$$->ipn_addr = $2[0]; $$->ipn_addr = $2[0];
$$->ipn_mask = $2[1]; $$->ipn_mask = $2[1];
#ifdef USE_INET6
if (use_inet6)
$$->ipn_addr.adf_family =
AF_INET6;
else
#endif
$$->ipn_addr.adf_family =
AF_INET;
} }
| YY_STR { $$ = add_poolhosts($1); | YY_STR { $$ = add_poolhosts($1);
free($1); free($1);