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

Checkpoint after pass.

Browse source
This commit is contained in:
Robin Sommer 2012-02-15 13:07:08 -08:00
parent c0f05f57a7
commit 7458ebf385
35 changed files with 594 additions and 524 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/RuleMatcher.cc
View file

@ -1070,14 +1070,16 @@ static bool val_to_maskedval(Val* v, maskedvalue_list* append_to)
{
const uint32* n;
uint32 m[4];
v->AsSubNet()->Prefix().GetBytes(&n);
v->AsSubNetVal()->Mask().CopyIPv6(m);
v->AsSubNet().Prefix().GetBytes(&n);
v->AsSubNetVal().Mask().CopyIPv6(m);
for ( unsigned int i = 0; i < 4; ++i )
m[i] = ntohl(m[i]);
bool is_v4_mask = m[0] == 0xffffffff &&
m[1] == m[0] && m[2] == m[0];
if ( v->AsSubNet()->Prefix().family() == IPAddr::IPv4 &&
if ( v->AsSubNet().Prefix().family() == IPAddr::IPv4 &&
is_v4_mask )
{
mval->val = ntohl(*n);