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

Add check_subnet bif that allows exact membership test for subnet tables.

Browse source 
This commit also fixes a few small bugs introduced in the last patricia
tree commit.
This commit is contained in:
Johanna Amann 2016-03-09 16:52:25 -08:00
parent 7ef431808d
commit 692662abcc
4 changed files with 82 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/PrefixTable.cc
View file

@ -106,7 +106,7 @@ list<IPPrefix> PrefixTable::FindAll(const IPAddr& addr, int width) const
list<IPPrefix> PrefixTable::FindAll(const SubNetVal* value) const
{
return FindAll(value->AsSubNet().Prefix(), value->AsSubNet().LengthIPv6());
return FindAll(value->AsSubNet().Prefix(), value->AsSubNet().Length());
}
void* PrefixTable::Lookup(const IPAddr& addr, int width, bool exact) const
@ -132,12 +132,12 @@ void* PrefixTable::Lookup(const Val* value, bool exact) const
switch ( value->Type()->Tag() ) {
case TYPE_ADDR:
return Lookup(value->AsAddr(), 128, exact);
return Lookup(value->AsAddr(), value->AsAddr().GetFamily() == IPv4 ? 32 : 128, exact);
break;
case TYPE_SUBNET:
return Lookup(value->AsSubNet().Prefix(),
value->AsSubNet().LengthIPv6(), exact);
value->AsSubNet().Length(), exact);
break;
default:
@ -171,12 +171,12 @@ void* PrefixTable::Remove(const Val* value)
switch ( value->Type()->Tag() ) {
case TYPE_ADDR:
return Remove(value->AsAddr(), 128);
return Remove(value->AsAddr(), value->AsAddr().GetFamily() == IPv4 ? 32 : 128);
break;
case TYPE_SUBNET:
return Remove(value->AsSubNet().Prefix(),
value->AsSubNet().LengthIPv6());
value->AsSubNet().Length());
break;
default: