mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 06:15:55 +00:00
Code Issues Releases Wiki Activity

- Two new operators, ~= and ~~, have been integrated to implement

Browse Source 
boolean matches by regular expression (such as may be used in
  class matching statements).  Thanks to a patch by Alexandr S.
  Agranovsky, which underwent slight modification.  [ISC-Bugs #8155]
This commit is contained in:
David Hankins
2007-06-07 15:52:30 +00:00
parent a546f2a714
commit dd3282251e
9 changed files with 179 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
common/parse.c
View File

@@ -34,7 +34,7 @@
#ifndef lint
static char copyright[] =
"$Id: parse.c,v 1.126 2007/05/29 18:11:55 each Exp $ Copyright (c) 2004-2007 Internet Systems Consortium. All rights reserved.\n";
"$Id: parse.c,v 1.127 2007/06/07 15:52:29 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -3195,6 +3195,7 @@ int parse_if_statement (result, cfile, lose)
* NOT boolean-expression |
* data-expression EQUAL data-expression |
* data-expression BANG EQUAL data-expression |
* data-expression REGEX_MATCH data-expression |
* boolean-expression AND boolean-expression |
* boolean-expression OR boolean-expression
* EXISTS OPTION-NAME
@@ -4559,6 +4560,35 @@ int parse_expression (expr, cfile, lose, context, plhs, binop)
context = expression_context (rhs);
break;
case TILDE:
#ifdef HAVE_REGEX_H
token = next_token(&val, NULL, cfile);
token = peek_token(&val, NULL, cfile);
if (token == TILDE)
next_op = expr_iregex_match;
else if (token == EQUAL)
next_op = expr_regex_match;
else {
parse_warn(cfile, "expecting ~= or ~~ operator");
*lose = 1;
skip_to_semi(cfile);
if (lhs)
expression_dereference(&lhs, MDL);
return 0;
}
context = expression_context(rhs);
#else
parse_warn(cfile, "No support for regex operator.");
*lose = 1;
skip_to_semi(cfile);
if (lhs != NULL)
expression_dereference(&lhs, MDL);
return 0;
#endif
break;
case AND:
next_op = expr_and;
context = expression_context (rhs);
@@ -4685,6 +4715,23 @@ int parse_expression (expr, cfile, lose, context, plhs, binop)
}
break;
case expr_regex_match:
#ifdef HAVE_REGEX_H
if (expression_context(rhs) != context_data) {
parse_warn(cfile, "expecting data expression");
skip_to_semi(cfile);
expression_dereference(&rhs, MDL);
*lose = 1;
return 0;
}
#else
/* It should not be possible to attempt to parse the right
* hand side of an operator there is no support for.
*/
log_fatal("Impossible condition at %s:%d.", MDL);
#endif
break;
case expr_and:
case expr_or:
if ((rhs_context != context_boolean) &&