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

Val: add BroValUnion constructors

Browse source 
Allows using C++ initializers.
This commit is contained in:
Max Kellermann 2020-02-07 11:25:07 +01:00
parent 5d58dbbd2e
commit 4a5473c572
2 changed files with 68 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/Val.cc
View file

@ -38,8 +38,8 @@
#include "threading/formatters/JSON.h"
Val::Val(Func* f)
:val(f)
{
val.func_val = f;
::Ref(val.func_val);
type = f->FType()->Ref();
#ifdef DEBUG
@ -48,13 +48,12 @@ Val::Val(Func* f)
}
Val::Val(BroFile* f)
:val(f)
{
static FileType* string_file_type = 0;
if ( ! string_file_type )
string_file_type = new FileType(base_type(TYPE_STRING));
val.file_val = f;
assert(f->FType()->Tag() == TYPE_STRING);
type = string_file_type->Ref();
@ -771,9 +770,8 @@ uint32_t PortVal::Mask(uint32_t port_num, TransportProto port_type)
return port_num;
}
PortVal::PortVal(uint32_t p) : Val(TYPE_PORT)
PortVal::PortVal(uint32_t p) : Val(bro_uint_t(p), TYPE_PORT)
{
val.uint_val = static_cast<bro_uint_t>(p);
}
uint32_t PortVal::Port() const
@ -823,29 +821,25 @@ Val* PortVal::DoClone(CloneState* state)
return Ref();
}
AddrVal::AddrVal(const char* text) : Val(TYPE_ADDR)
AddrVal::AddrVal(const char* text) : Val(new IPAddr(text), TYPE_ADDR)
{
val.addr_val = new IPAddr(text);
}
AddrVal::AddrVal(const std::string& text) : AddrVal(text.c_str())
{
}
AddrVal::AddrVal(uint32_t addr) : Val(TYPE_ADDR)
AddrVal::AddrVal(uint32_t addr) : Val(new IPAddr(IPv4, &addr, IPAddr::Network), TYPE_ADDR)
{
// ### perhaps do gethostbyaddr here?
val.addr_val = new IPAddr(IPv4, &addr, IPAddr::Network);
}
AddrVal::AddrVal(const uint32_t addr[4]) : Val(TYPE_ADDR)
AddrVal::AddrVal(const uint32_t addr[4]) : Val(new IPAddr(IPv6, addr, IPAddr::Network), TYPE_ADDR)
{
val.addr_val = new IPAddr(IPv6, addr, IPAddr::Network);
}
AddrVal::AddrVal(const IPAddr& addr) : Val(TYPE_ADDR)
AddrVal::AddrVal(const IPAddr& addr) : Val(new IPAddr(addr), TYPE_ADDR)
{
val.addr_val = new IPAddr(addr);
}
AddrVal::~AddrVal()
@ -872,17 +866,14 @@ Val* AddrVal::DoClone(CloneState* state)
return Ref();
}
SubNetVal::SubNetVal(const char* text) : Val(TYPE_SUBNET)
SubNetVal::SubNetVal(const char* text) : Val(new IPPrefix(), TYPE_SUBNET)
{
val.subnet_val = new IPPrefix();
if ( ! IPPrefix::ConvertString(text, val.subnet_val) )
reporter->Error("Bad string in SubNetVal ctor: %s", text);
}
SubNetVal::SubNetVal(const char* text, int width) : Val(TYPE_SUBNET)
SubNetVal::SubNetVal(const char* text, int width) : Val(new IPPrefix(text, width), TYPE_SUBNET)
{
val.subnet_val = new IPPrefix(text, width);
}
SubNetVal::SubNetVal(uint32_t addr, int width) : SubNetVal(IPAddr{IPv4, &addr, IPAddr::Network}, width)
@ -893,14 +884,12 @@ SubNetVal::SubNetVal(const uint32_t* addr, int width) : SubNetVal(IPAddr{IPv6, a
{
}
SubNetVal::SubNetVal(const IPAddr& addr, int width) : Val(TYPE_SUBNET)
SubNetVal::SubNetVal(const IPAddr& addr, int width) : Val(new IPPrefix(addr, width), TYPE_SUBNET)
{
val.subnet_val = new IPPrefix(addr, width);
}
SubNetVal::SubNetVal(const IPPrefix& prefix) : Val(TYPE_SUBNET)
SubNetVal::SubNetVal(const IPPrefix& prefix) : Val(new IPPrefix(prefix), TYPE_SUBNET)
{
val.subnet_val = new IPPrefix(prefix);
}
SubNetVal::~SubNetVal()
@ -974,9 +963,8 @@ Val* SubNetVal::DoClone(CloneState* state)
return Ref();
}
StringVal::StringVal(BroString* s) : Val(TYPE_STRING)
StringVal::StringVal(BroString* s) : Val(s, TYPE_STRING)
{
val.string_val = s;
}
// The following adds a NUL at the end.