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

Working on merging the v6-addr branch. This is checkpoint, tests don't

Browse source 
pass yet.

Changes:

- Gave IPAddress/IPPrefix methods AsString() so that one doesn't need
  to cast to get a string represenation.

- Val::AsAddr()/AsSubnet() return references rather than pointers. I
  find that more intuitive.

- ODesc/Serializer/SerializationFormat get methods to support
  IPAddress/IPPrefix directly.

- Reformatted the comments in IPAddr.h from /// to /** style.

- Given IPPrefix a Contains() method.

- A bit of cleanup.
This commit is contained in:
Robin Sommer 2012-02-16 18:23:26 -08:00
parent 7458ebf385
commit 94b9644da7
20 changed files with 160 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/CompHash.cc
View file

@ -109,7 +109,7 @@ char* CompositeHash::SingleValHash(int type_check, char* kp0,
{
uint32* kp = AlignAndPadType<uint32>(kp0);
uint32 bytes[4];
v->AsAddr()->CopyIPv6(bytes);
v->AsAddr().CopyIPv6(bytes);
kp[0] = bytes[0];
kp[1] = bytes[1];
kp[2] = bytes[2];
@ -122,12 +122,12 @@ char* CompositeHash::SingleValHash(int type_check, char* kp0,
{
uint32* kp = AlignAndPadType<uint32>(kp0);
uint32 bytes[4];
v->AsSubNet()->Prefix().CopyIPv6(bytes);
v->AsSubNet().Prefix().CopyIPv6(bytes);
kp[0] = bytes[0];
kp[1] = bytes[1];
kp[2] = bytes[2];
kp[3] = bytes[3];
kp[4] = v->AsSubNet()->Length();
kp[4] = v->AsSubNet().Length();
kp1 = reinterpret_cast<char*>(kp+5);
}
break;
@ -354,15 +354,15 @@ HashKey* CompositeHash::ComputeSingletonHash(const Val* v, int type_check) const
case TYPE_INTERNAL_ADDR:
{
uint32 bytes[4];
v->AsAddr()->CopyIPv6(bytes);
v->AsAddr().CopyIPv6(bytes);
return new HashKey((void*)bytes, 4 * sizeof(uint32));
}
case TYPE_INTERNAL_SUBNET:
{
uint32 bytes[5];
v->AsSubNet()->Prefix().CopyIPv6(bytes);
bytes[4] = v->AsSubNet()->Length();
v->AsSubNet().Prefix().CopyIPv6(bytes);
bytes[4] = v->AsSubNet().Length();
return new HashKey((void*)bytes, 5 * sizeof(uint32));
}