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

Move all of the hashing classes/functions to zeek::detail namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-21 13:34:17 -07:00
parent 93948b4d19
commit a2a435360a
40 changed files with 289 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/IPAddr.cc
View file

@ -54,12 +54,12 @@ IPAddr::IPAddr(const zeek::String& s)
Init(s.CheckString());
}
HashKey* IPAddr::GetHashKey() const
zeek::detail::HashKey* IPAddr::GetHashKey() const
{ return MakeHashKey().release(); }
std::unique_ptr<HashKey> IPAddr::MakeHashKey() const
std::unique_ptr<zeek::detail::HashKey> IPAddr::MakeHashKey() const
{
return std::make_unique<HashKey>((void*)in6.s6_addr, sizeof(in6.s6_addr));
return std::make_unique<zeek::detail::HashKey>((void*)in6.s6_addr, sizeof(in6.s6_addr));
}
static inline uint32_t bit_mask32(int bottom_bits)
@ -307,10 +307,10 @@ std::string IPPrefix::AsString() const
return prefix.AsString() +"/" + l;
}
HashKey* IPPrefix::GetHashKey() const
zeek::detail::HashKey* IPPrefix::GetHashKey() const
{ return MakeHashKey().release(); }
std::unique_ptr<HashKey> IPPrefix::MakeHashKey() const
std::unique_ptr<zeek::detail::HashKey> IPPrefix::MakeHashKey() const
{
struct {
in6_addr ip;
@ -320,7 +320,7 @@ std::unique_ptr<HashKey> IPPrefix::MakeHashKey() const
key.ip = prefix.in6;
key.len = Length();
return std::make_unique<HashKey>(&key, sizeof(key));
return std::make_unique<zeek::detail::HashKey>(&key, sizeof(key));
}
bool IPPrefix::ConvertString(const char* text, IPPrefix* result)