Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 14:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/timw/173-port-ranges'

Browse source 
* origin/topic/timw/173-port-ranges:
  GH-173: Support ranges of values for value_list elements in the signature parser
  GH-173: Modify the signature parser so ID components (such as variable names) can't start with numbers
This commit is contained in:
Jon Siwek 2019-05-23 13:04:17 -07:00
commit 30db17464d
8 changed files with 54 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/rule-parse.y
View file

@ -70,6 +70,7 @@ static uint8_t ip4_mask_to_len(uint32_t mask)
%type <vallist> value_list
%type <prefix_val_list> prefix_value_list
%type <mval> TOK_IP value
%type <vallist> ranged_value
%type <prefixval> TOK_IP6 prefix_value
%type <prot> TOK_PROT
%type <ptype> TOK_PATTERN_TYPE
@ -274,6 +275,16 @@ hdr_expr:
value_list:
value_list ',' value
{ $1->append(new MaskedValue($3)); $$ = $1; }
| value_list ',' ranged_value
{
int numVals = $3->length();
for ( int idx = 0; idx < numVals; idx++ )
{
MaskedValue* val = (*$3)[idx];
$1->append(val);
}
$$ = $1;
}
| value_list ',' TOK_IDENT
{ id_to_maskedvallist($3, $1); $$ = $1; }
| value
@ -281,6 +292,10 @@ value_list:
$$ = new maskedvalue_list();
$$->append(new MaskedValue($1));
}
| ranged_value
{
$$ = $1;
}
| TOK_IDENT
{
$$ = new maskedvalue_list();
@ -320,6 +335,20 @@ prefix_value:
| TOK_IP6
;
ranged_value:
TOK_INT '-' TOK_INT
{
$$ = new maskedvalue_list();
for ( int val = $1; val <= $3; val++ )
{
MaskedValue* masked = new MaskedValue();
masked->val = val;
masked->mask = 0xffffffff;
$$->append(masked);
}
}
;
value:
TOK_INT
{ $$.val = $1; $$.mask = 0xffffffff; }