Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-12 11: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

12
src/threading/SerialTypes.cc
View file

@ -475,14 +475,14 @@ zeek::Val* Value::ValueToVal(const std::string& source, const Value* val, bool&
case zeek::TYPE_ADDR:
{
IPAddr* addr = nullptr;
zeek::IPAddr* addr = nullptr;
switch ( val->val.addr_val.family ) {
case IPv4:
addr = new IPAddr(val->val.addr_val.in.in4);
addr = new zeek::IPAddr(val->val.addr_val.in.in4);
break;
case IPv6:
addr = new IPAddr(val->val.addr_val.in.in6);
addr = new zeek::IPAddr(val->val.addr_val.in.in6);
break;
default:
@ -496,14 +496,14 @@ zeek::Val* Value::ValueToVal(const std::string& source, const Value* val, bool&
case zeek::TYPE_SUBNET:
{
IPAddr* addr = nullptr;
zeek::IPAddr* addr = nullptr;
switch ( val->val.subnet_val.prefix.family ) {
case IPv4:
addr = new IPAddr(val->val.subnet_val.prefix.in.in4);
addr = new zeek::IPAddr(val->val.subnet_val.prefix.in.in4);
break;
case IPv6:
addr = new IPAddr(val->val.subnet_val.prefix.in.in6);
addr = new zeek::IPAddr(val->val.subnet_val.prefix.in.in6);
break;
default:

2
src/threading/SerialTypes.h
View file

@ -210,7 +210,7 @@ struct Value {
static zeek::Val* ValueToVal(const std::string& source, const threading::Value* val, bool& have_error);
private:
friend class ::IPAddr;
friend class IPAddr;
Value(const Value& other) = delete;
};