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

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

16
src/SerializationFormat.cc
View file

@ -234,7 +234,7 @@ bool BinarySerializationFormat::Read(std::string* v, const char* tag)
return true;
}
bool BinarySerializationFormat::Read(IPAddr* addr, const char* tag)
bool BinarySerializationFormat::Read(zeek::IPAddr* addr, const char* tag)
{
int n = 0;
if ( ! Read(&n, "addr-len") )
@ -254,22 +254,22 @@ bool BinarySerializationFormat::Read(IPAddr* addr, const char* tag)
}
if ( n == 1 )
*addr = IPAddr(IPv4, raw, IPAddr::Network);
*addr = zeek::IPAddr(IPv4, raw, zeek::IPAddr::Network);
else
*addr = IPAddr(IPv6, raw, IPAddr::Network);
*addr = zeek::IPAddr(IPv6, raw, zeek::IPAddr::Network);
return true;
}
bool BinarySerializationFormat::Read(IPPrefix* prefix, const char* tag)
bool BinarySerializationFormat::Read(zeek::IPPrefix* prefix, const char* tag)
{
IPAddr addr;
zeek::IPAddr addr;
int len;
if ( ! (Read(&addr, "prefix") && Read(&len, "width")) )
return false;
*prefix = IPPrefix(addr, len);
*prefix = zeek::IPPrefix(addr, len);
return true;
}
@ -368,7 +368,7 @@ bool BinarySerializationFormat::Write(const std::string& s, const char* tag)
return Write(s.data(), s.size(), tag);
}
bool BinarySerializationFormat::Write(const IPAddr& addr, const char* tag)
bool BinarySerializationFormat::Write(const zeek::IPAddr& addr, const char* tag)
{
const uint32_t* raw;
int n = addr.GetBytes(&raw);
@ -387,7 +387,7 @@ bool BinarySerializationFormat::Write(const IPAddr& addr, const char* tag)
return true;
}
bool BinarySerializationFormat::Write(const IPPrefix& prefix, const char* tag)
bool BinarySerializationFormat::Write(const zeek::IPPrefix& prefix, const char* tag)
{
return Write(prefix.Prefix(), "prefix") && Write(prefix.Length(), "width");
}