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

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/IPAddr.cc
View file

@ -12,15 +12,15 @@
#include "analyzer/Manager.h"
const uint8_t IPAddr::v4_mapped_prefix[12] = { 0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0xff, 0xff };
constexpr uint8_t zeek::IPAddr::v4_mapped_prefix[12] = { 0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0xff, 0xff };
const IPAddr IPAddr::v4_unspecified = IPAddr(in4_addr{});
const zeek::IPAddr zeek::IPAddr::v4_unspecified = zeek::IPAddr(in4_addr{});
const IPAddr IPAddr::v6_unspecified = IPAddr();
const zeek::IPAddr zeek::IPAddr::v6_unspecified = zeek::IPAddr();
ConnIDKey BuildConnIDKey(const ConnID& id)
zeek::detail::ConnIDKey zeek::detail::BuildConnIDKey(const ConnID& id)
{
ConnIDKey key;
@ -47,6 +47,8 @@ ConnIDKey BuildConnIDKey(const ConnID& id)
return key;
}
namespace zeek {
IPAddr::IPAddr(const zeek::String& s)
{
Init(s.CheckString());
@ -345,3 +347,5 @@ bool IPPrefix::ConvertString(const char* text, IPPrefix* result)
*result = IPPrefix(ip, len);
return true;
}
} // namespace zeek