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

Move everything in util.h to zeek::util namespace.

Browse source 
This commit includes renaming a number of methods prefixed with bro_ to be prefixed with zeek_.
This commit is contained in:
Tim Wojtulewicz 2020-08-06 10:40:24 -07:00
parent 8862b585fa
commit 8d2d867a65
179 changed files with 1277 additions and 1033 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/input/Manager.cc
View file

@ -244,8 +244,8 @@ bool Manager::CreateStream(Stream* info, zeek::RecordVal* description)
string source((const char*) bsource->Bytes(), bsource->Len());
ReaderBackend::ReaderInfo rinfo;
rinfo.source = copy_string(source.c_str());
rinfo.name = copy_string(name.c_str());
rinfo.source = zeek::util::copy_string(source.c_str());
rinfo.name = zeek::util::copy_string(name.c_str());
auto mode_val = description->GetFieldOrDefault("mode");
auto mode = mode_val->AsEnumVal();
@ -282,7 +282,7 @@ bool Manager::CreateStream(Stream* info, zeek::RecordVal* description)
auto index = info->config->RecreateIndex(*k);
string key = index->Idx(0)->AsString()->CheckString();
string value = v->GetVal()->AsString()->CheckString();
rinfo.config.insert(std::make_pair(copy_string(key.c_str()), copy_string(value.c_str())));
rinfo.config.insert(std::make_pair(zeek::util::copy_string(key.c_str()), zeek::util::copy_string(value.c_str())));
delete k;
}
}
@ -1828,7 +1828,7 @@ void Manager::SendEvent(zeek::EventHandlerPtr ev, const int numvals, ...) const
va_end(lP);
if ( ev )
zeek::event_mgr.Enqueue(ev, std::move(vl), SOURCE_LOCAL);
zeek::event_mgr.Enqueue(ev, std::move(vl), zeek::util::SOURCE_LOCAL);
}
void Manager::SendEvent(zeek::EventHandlerPtr ev, list<zeek::Val*> events) const
@ -1845,7 +1845,7 @@ void Manager::SendEvent(zeek::EventHandlerPtr ev, list<zeek::Val*> events) const
vl.emplace_back(zeek::AdoptRef{}, *i);
if ( ev )
zeek::event_mgr.Enqueue(ev, std::move(vl), SOURCE_LOCAL);
zeek::event_mgr.Enqueue(ev, std::move(vl), zeek::util::SOURCE_LOCAL);
}
// Convert a bro list value to a bro record value.

2
src/input/ReaderBackend.cc
View file

@ -63,7 +63,7 @@ public:
ReaderErrorMessage(ReaderFrontend* reader, Type arg_type, const char* arg_msg)
: threading::OutputMessage<ReaderFrontend>("ReaderErrorMessage", reader)
{ type = arg_type; msg = copy_string(arg_msg); }
{ type = arg_type; msg = zeek::util::copy_string(arg_msg); }
~ReaderErrorMessage() override { delete [] msg; }

8
src/input/ReaderBackend.h
View file

@ -75,7 +75,7 @@ public:
struct ReaderInfo
{
// Structure takes ownership of the strings.
typedef std::map<const char*, const char*, CompareString> config_map;
typedef std::map<const char*, const char*, zeek::util::CompareString> config_map;
/**
* A string left to the interpretation of the reader
@ -111,12 +111,12 @@ public:
ReaderInfo(const ReaderInfo& other)
{
source = other.source ? copy_string(other.source) : nullptr;
name = other.name ? copy_string(other.name) : nullptr;
source = other.source ? zeek::util::copy_string(other.source) : nullptr;
name = other.name ? zeek::util::copy_string(other.name) : nullptr;
mode = other.mode;
for ( config_map::const_iterator i = other.config.begin(); i != other.config.end(); i++ )
config.insert(std::make_pair(copy_string(i->first), copy_string(i->second)));
config.insert(std::make_pair(zeek::util::copy_string(i->first), zeek::util::copy_string(i->second)));
}
~ReaderInfo()

2
src/input/ReaderFrontend.cc
View file

@ -40,7 +40,7 @@ ReaderFrontend::ReaderFrontend(const ReaderBackend::ReaderInfo& arg_info, zeek::
info = new ReaderBackend::ReaderInfo(arg_info);
const char* t = type->GetType()->AsEnumType()->Lookup(type->InternalInt());
name = copy_string(fmt("%s/%s", arg_info.source, t));
name = zeek::util::copy_string(zeek::util::fmt("%s/%s", arg_info.source, t));
backend = input_mgr->CreateBackend(this, type);
assert(backend);

2
src/input/readers/benchmark/Benchmark.cc
View file

@ -137,7 +137,7 @@ zeek::threading::Value* Benchmark::EntryToVal(zeek::TypeTag type, zeek::TypeTag
case zeek::TYPE_STRING:
{
std::string rnd = RandomString(10);
val->val.string_val.data = copy_string(rnd.c_str());
val->val.string_val.data = zeek::util::copy_string(rnd.c_str());
val->val.string_val.length = rnd.size();
break;
}

10
src/input/readers/config/Config.cc
View file

@ -248,11 +248,11 @@ bool Config::DoUpdate()
Value** fields = new Value*[2];
Value* keyval = new threading::Value(zeek::TYPE_STRING, true);
keyval->val.string_val.length = key.size();
keyval->val.string_val.data = copy_string(key.c_str());
keyval->val.string_val.data = zeek::util::copy_string(key.c_str());
fields[0] = keyval;
Value* val = new threading::Value(zeek::TYPE_STRING, true);
val->val.string_val.length = value.size();
val->val.string_val.data = copy_string(value.c_str());
val->val.string_val.data = zeek::util::copy_string(value.c_str());
fields[1] = val;
if ( Info().mode == zeek::input::MODE_STREAM )
@ -264,13 +264,13 @@ bool Config::DoUpdate()
{
Value** vals = new Value*[4];
vals[0] = new Value(zeek::TYPE_STRING, true);
vals[0]->val.string_val.data = copy_string(Info().name);
vals[0]->val.string_val.data = zeek::util::copy_string(Info().name);
vals[0]->val.string_val.length = strlen(Info().name);
vals[1] = new Value(zeek::TYPE_STRING, true);
vals[1]->val.string_val.data = copy_string(Info().source);
vals[1]->val.string_val.data = zeek::util::copy_string(Info().source);
vals[1]->val.string_val.length = strlen(Info().source);
vals[2] = new Value(zeek::TYPE_STRING, true);
vals[2]->val.string_val.data = copy_string(key.c_str());
vals[2]->val.string_val.data = zeek::util::copy_string(key.c_str());
vals[2]->val.string_val.length = key.size();
vals[3] = eventval;

15
src/input/readers/raw/Raw.cc
View file

@ -82,7 +82,7 @@ void Raw::ClosePipeEnd(int i)
if ( pipes[i] == -1 )
return;
safe_close(pipes[i]);
zeek::util::safe_close(pipes[i]);
pipes[i] = -1;
}
@ -92,7 +92,7 @@ bool Raw::SetFDFlags(int fd, int cmd, int flags)
return true;
char buf[256];
bro_strerror_r(errno, buf, sizeof(buf));
zeek::util::zeek_strerror_r(errno, buf, sizeof(buf));
Error(Fmt("failed to set fd flags: %s", buf));
return false;
}
@ -199,7 +199,7 @@ bool Raw::Execute()
else
{
char buf[256];
bro_strerror_r(errno, buf, sizeof(buf));
zeek::util::zeek_strerror_r(errno, buf, sizeof(buf));
Warning(Fmt("Could not set child process group: %s", buf));
}
}
@ -295,7 +295,7 @@ bool Raw::OpenInput()
if ( fseek(file.get(), pos, whence) < 0 )
{
char buf[256];
bro_strerror_r(errno, buf, sizeof(buf));
zeek::util::zeek_strerror_r(errno, buf, sizeof(buf));
Error(Fmt("Seek failed in init: %s", buf));
}
}
@ -459,7 +459,8 @@ int64_t Raw::GetLine(FILE* arg_file)
// researching everything each time is a bit... cpu-intensive. But otherwhise we have
// to deal with situations where the separator is multi-character and split over multiple
// reads...
int found = strstr_n(pos, (unsigned char*) buf.get(), separator.size(), (unsigned char*) separator.c_str());
int found = zeek::util::strstr_n(pos, (unsigned char*) buf.get(),
separator.size(), (unsigned char*) separator.c_str());
if ( found == -1 )
{
@ -678,10 +679,10 @@ bool Raw::DoUpdate()
Value** vals = new Value*[4];
vals[0] = new Value(zeek::TYPE_STRING, true);
vals[0]->val.string_val.data = copy_string(Info().name);
vals[0]->val.string_val.data = zeek::util::copy_string(Info().name);
vals[0]->val.string_val.length = strlen(Info().name);
vals[1] = new Value(zeek::TYPE_STRING, true);
vals[1]->val.string_val.data = copy_string(Info().source);
vals[1]->val.string_val.data = zeek::util::copy_string(Info().source);
vals[1]->val.string_val.length = strlen(Info().source);
vals[2] = new Value(zeek::TYPE_COUNT, true);
vals[2]->val.int_val = code;