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

Move IP Addr/Prefix/Header classes into namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-16 16:26:22 -07:00
parent 35c61697d9
commit 25c0fc7ab2
100 changed files with 495 additions and 460 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/rule-parse.y
View file

@ -81,8 +81,8 @@ static uint8_t ip4_mask_to_len(uint32_t mask)
Rule* rule;
RuleHdrTest* hdr_test;
maskedvalue_list* vallist;
std::vector<IPPrefix>* prefix_val_list;
IPPrefix* prefixval;
std::vector<zeek::IPPrefix>* prefix_val_list;
zeek::IPPrefix* prefixval;
bool bl;
int val;
@ -318,12 +318,12 @@ prefix_value_list:
}
| prefix_value
{
$$ = new std::vector<IPPrefix>();
$$ = new std::vector<zeek::IPPrefix>();
$$->push_back(*($1));
}
| TOK_IDENT
{
$$ = new std::vector<IPPrefix>();
$$ = new std::vector<zeek::IPPrefix>();
id_to_maskedvallist($1, 0, $$);
}
;
@ -331,8 +331,8 @@ prefix_value_list:
prefix_value:
TOK_IP
{
$$ = new IPPrefix(IPAddr(IPv4, &($1.val), IPAddr::Host),
ip4_mask_to_len($1.mask));
$$ = new zeek::IPPrefix(zeek::IPAddr(IPv4, &($1.val), zeek::IPAddr::Host),
ip4_mask_to_len($1.mask));
}
| TOK_IP6
;