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

logging/Manager: Extract path_func invocation into helper

Browse source
This commit is contained in:
Arne Welzel 2024-08-08 19:30:12 +02:00
parent 0d925e935e
commit 16cca62292
1 changed files with 46 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/logging/Manager.cc
View file

@ -225,6 +225,10 @@ struct Manager::Filter {
vector<list<int>> indices; vector<list<int>> indices;
~Filter(); ~Filter();
// Invoke path_func of this filter and sets write_path with the
// result. Returns true on success, otherwise false.
bool InvokePathFunc(const Manager::Stream* stream, const zeek::RecordValPtr& columns, std::string& write_path);
}; };
struct Manager::WriterInfo { struct Manager::WriterInfo {
@ -285,6 +289,47 @@ struct Manager::Stream {
void DispatchDelayExpiredTimer(double t, bool is_expire); void DispatchDelayExpiredTimer(double t, bool is_expire);
}; };
bool Manager::Filter::InvokePathFunc(const Manager::Stream* stream, const zeek::RecordValPtr& columns,
std::string& write_path) {
ValPtr path_arg;
if ( path_val )
path_arg = {NewRef{}, path_val};
else
path_arg = val_mgr->EmptyString();
ValPtr rec_arg;
const auto& rt = path_func->GetType()->Params()->GetFieldType("rec");
if ( rt->Tag() == TYPE_RECORD )
rec_arg = columns->CoerceTo(cast_intrusive<RecordType>(rt), true);
else
// Can be TYPE_ANY here.
rec_arg = columns;
auto v = path_func->Invoke(IntrusivePtr{NewRef{}, stream->id}, std::move(path_arg), std::move(rec_arg));
if ( ! v ) {
reporter->Error("path_func did not return a value");
return false;
}
if ( v->GetType()->Tag() != TYPE_STRING ) {
reporter->Error("path_func did not return string");
return false;
}
// If this filter didn't have path_val set, do so now.
if ( ! path_val ) {
path = v->AsString()->CheckString();
path_val = v->Ref();
}
write_path = v->AsString()->CheckString();
return true;
}
Manager::Filter::~Filter() { Manager::Filter::~Filter() {
Unref(fval); Unref(fval);
Unref(field_name_map); Unref(field_name_map);
@ -1034,44 +1079,11 @@ bool Manager::WriteToFilters(const Manager::Stream* stream, zeek::RecordValPtr c
continue; continue;
if ( filter->path_func ) { if ( filter->path_func ) {
ValPtr path_arg; if ( ! filter->InvokePathFunc(stream, columns, path) )
if ( filter->path_val )
path_arg = {NewRef{}, filter->path_val};
else
path_arg = val_mgr->EmptyString();
ValPtr rec_arg;
const auto& rt = filter->path_func->GetType()->Params()->GetFieldType("rec");
if ( rt->Tag() == TYPE_RECORD )
rec_arg = columns->CoerceTo(cast_intrusive<RecordType>(rt), true);
else
// Can be TYPE_ANY here.
rec_arg = columns;
auto v =
filter->path_func->Invoke(IntrusivePtr{NewRef{}, stream->id}, std::move(path_arg), std::move(rec_arg));
if ( ! v )
return false; return false;
if ( v->GetType()->Tag() != TYPE_STRING ) {
reporter->Error("path_func did not return string");
return false;
}
if ( ! filter->path_val ) {
filter->path = v->AsString()->CheckString();
filter->path_val = v->Ref();
}
path = v->AsString()->CheckString();
#ifdef DEBUG
DBG_LOG(DBG_LOGGING, "Path function for filter '%s' on stream '%s' return '%s'", filter->name.c_str(), DBG_LOG(DBG_LOGGING, "Path function for filter '%s' on stream '%s' return '%s'", filter->name.c_str(),
stream->name.c_str(), path.c_str()); stream->name.c_str(), path.c_str());
#endif
} }
Stream::WriterPathPair wpp(filter->writer->AsEnum(), path); Stream::WriterPathPair wpp(filter->writer->AsEnum(), path);