mirror of
https://github.com/zeek/zeek.git
synced 2025-10-14 20:48:21 +00:00
Move all Val classes to the zeek namespaces
This commit is contained in:
Tim Wojtulewicz
parent
ec9eff0bd5
commit
64332ca22c
265 changed files with 3154 additions and 3086 deletions
|
|
@ -61,12 +61,12 @@ public:
|
|||
|
||||
StreamType stream_type; // to distinguish between event and table streams
|
||||
|
||||
EnumVal* type;
|
||||
zeek::EnumVal* type;
|
||||
ReaderFrontend* reader;
|
||||
TableVal* config;
|
||||
zeek::TableVal* config;
|
||||
EventHandlerPtr error_event;
|
||||
|
||||
RecordVal* description;
|
||||
zeek::RecordVal* description;
|
||||
|
||||
virtual ~Stream();
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ public:
|
|||
unsigned int num_val_fields;
|
||||
bool want_record;
|
||||
|
||||
TableVal* tab;
|
||||
zeek::TableVal* tab;
|
||||
zeek::RecordType* rtype;
|
||||
zeek::RecordType* itype;
|
||||
|
||||
|
|
@ -198,7 +198,7 @@ Manager::~Manager()
|
|||
|
||||
}
|
||||
|
||||
ReaderBackend* Manager::CreateBackend(ReaderFrontend* frontend, EnumVal* tag)
|
||||
ReaderBackend* Manager::CreateBackend(ReaderFrontend* frontend, zeek::EnumVal* tag)
|
||||
{
|
||||
Component* c = Lookup(tag);
|
||||
|
||||
|
|
@ -215,7 +215,7 @@ ReaderBackend* Manager::CreateBackend(ReaderFrontend* frontend, EnumVal* tag)
|
|||
}
|
||||
|
||||
// Create a new input reader object to be used at whomevers leisure later on.
|
||||
bool Manager::CreateStream(Stream* info, RecordVal* description)
|
||||
bool Manager::CreateStream(Stream* info, zeek::RecordVal* description)
|
||||
{
|
||||
zeek::RecordType* rtype = description->GetType()->AsRecordType();
|
||||
if ( ! ( same_type(rtype, zeek::BifType::Record::Input::TableDescription, false)
|
||||
|
|
@ -275,7 +275,7 @@ bool Manager::CreateStream(Stream* info, RecordVal* description)
|
|||
HashKey* k;
|
||||
IterCookie* c = info->config->AsTable()->InitForIteration();
|
||||
|
||||
TableEntryVal* v;
|
||||
zeek::TableEntryVal* v;
|
||||
while ( (v = info->config->AsTable()->NextEntry(k, c)) )
|
||||
{
|
||||
auto index = info->config->RecreateIndex(*k);
|
||||
|
|
@ -303,7 +303,7 @@ bool Manager::CreateStream(Stream* info, RecordVal* description)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool Manager::CreateEventStream(RecordVal* fval)
|
||||
bool Manager::CreateEventStream(zeek::RecordVal* fval)
|
||||
{
|
||||
zeek::RecordType* rtype = fval->GetType()->AsRecordType();
|
||||
if ( ! same_type(rtype, zeek::BifType::Record::Input::EventDescription, false) )
|
||||
|
|
@ -457,7 +457,7 @@ bool Manager::CreateEventStream(RecordVal* fval)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool Manager::CreateTableStream(RecordVal* fval)
|
||||
bool Manager::CreateTableStream(zeek::RecordVal* fval)
|
||||
{
|
||||
zeek::RecordType* rtype = fval->GetType()->AsRecordType();
|
||||
if ( ! same_type(rtype, zeek::BifType::Record::Input::TableDescription, false) )
|
||||
|
|
@ -739,7 +739,7 @@ bool Manager::CheckErrorEventTypes(const std::string& stream_name, const Func* e
|
|||
return true;
|
||||
}
|
||||
|
||||
bool Manager::CreateAnalysisStream(RecordVal* fval)
|
||||
bool Manager::CreateAnalysisStream(zeek::RecordVal* fval)
|
||||
{
|
||||
zeek::RecordType* rtype = fval->GetType()->AsRecordType();
|
||||
|
||||
|
|
@ -929,7 +929,7 @@ bool Manager::UnrollRecordType(vector<Field*> *fields, const zeek::RecordType *r
|
|||
{
|
||||
string name = nameprepend + rec->FieldName(i);
|
||||
const char* secondary = nullptr;
|
||||
ValPtr c;
|
||||
zeek::ValPtr c;
|
||||
zeek::TypeTag ty = rec->GetFieldType(i)->Tag();
|
||||
zeek::TypeTag st = zeek::TYPE_VOID;
|
||||
bool optional = false;
|
||||
|
|
@ -989,9 +989,9 @@ bool Manager::ForceUpdate(const string &name)
|
|||
}
|
||||
|
||||
|
||||
Val* Manager::RecordValToIndexVal(RecordVal *r) const
|
||||
zeek::Val* Manager::RecordValToIndexVal(zeek::RecordVal* r) const
|
||||
{
|
||||
ValPtr idxval;
|
||||
zeek::ValPtr idxval;
|
||||
|
||||
zeek::RecordType *type = r->GetType()->AsRecordType();
|
||||
|
||||
|
|
@ -1002,7 +1002,7 @@ Val* Manager::RecordValToIndexVal(RecordVal *r) const
|
|||
|
||||
else
|
||||
{
|
||||
auto l = zeek::make_intrusive<ListVal>(zeek::TYPE_ANY);
|
||||
auto l = zeek::make_intrusive<zeek::ListVal>(zeek::TYPE_ANY);
|
||||
for ( int j = 0 ; j < num_fields; j++ )
|
||||
l->Append(r->GetFieldOrDefault(j));
|
||||
|
||||
|
|
@ -1014,12 +1014,12 @@ Val* Manager::RecordValToIndexVal(RecordVal *r) const
|
|||
}
|
||||
|
||||
|
||||
Val* Manager::ValueToIndexVal(const Stream* i, int num_fields, const zeek::RecordType *type, const Value* const *vals, bool& have_error) const
|
||||
zeek::Val* Manager::ValueToIndexVal(const Stream* i, int num_fields, const zeek::RecordType *type,
|
||||
const Value* const *vals, bool& have_error) const
|
||||
{
|
||||
Val* idxval;
|
||||
zeek::Val* idxval;
|
||||
int position = 0;
|
||||
|
||||
|
||||
if ( num_fields == 1 && type->GetFieldType(0)->Tag() != zeek::TYPE_RECORD )
|
||||
{
|
||||
idxval = ValueToVal(i, vals[0], type->GetFieldType(0).get(), have_error);
|
||||
|
|
@ -1027,7 +1027,7 @@ Val* Manager::ValueToIndexVal(const Stream* i, int num_fields, const zeek::Recor
|
|||
}
|
||||
else
|
||||
{
|
||||
ListVal *l = new ListVal(zeek::TYPE_ANY);
|
||||
auto* l = new zeek::ListVal(zeek::TYPE_ANY);
|
||||
for ( int j = 0 ; j < type->NumFields(); j++ )
|
||||
{
|
||||
if ( type->GetFieldType(j)->Tag() == zeek::TYPE_RECORD )
|
||||
|
|
@ -1140,8 +1140,8 @@ int Manager::SendEntryTable(Stream* i, const Value* const *vals)
|
|||
|
||||
}
|
||||
|
||||
Val* valval;
|
||||
RecordVal* predidx = nullptr;
|
||||
zeek::Val* valval;
|
||||
zeek::RecordVal* predidx = nullptr;
|
||||
|
||||
int position = stream->num_idx_fields;
|
||||
|
||||
|
|
@ -1159,7 +1159,7 @@ int Manager::SendEntryTable(Stream* i, const Value* const *vals)
|
|||
// call stream first to determine if we really add / change the entry
|
||||
if ( stream->pred && ! convert_error )
|
||||
{
|
||||
EnumValPtr ev;
|
||||
zeek::EnumValPtr ev;
|
||||
int startpos = 0;
|
||||
bool pred_convert_error = false;
|
||||
predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, pred_convert_error);
|
||||
|
|
@ -1208,7 +1208,7 @@ int Manager::SendEntryTable(Stream* i, const Value* const *vals)
|
|||
delete h;
|
||||
h = nullptr;
|
||||
|
||||
Val* idxval;
|
||||
zeek::Val* idxval;
|
||||
if ( predidx != nullptr )
|
||||
{
|
||||
idxval = RecordValToIndexVal(predidx);
|
||||
|
|
@ -1230,7 +1230,7 @@ int Manager::SendEntryTable(Stream* i, const Value* const *vals)
|
|||
|
||||
assert(idxval);
|
||||
|
||||
ValPtr oldval;
|
||||
zeek::ValPtr oldval;
|
||||
if ( updated == true )
|
||||
{
|
||||
assert(stream->num_val_fields > 0);
|
||||
|
|
@ -1259,7 +1259,7 @@ int Manager::SendEntryTable(Stream* i, const Value* const *vals)
|
|||
if ( stream->event )
|
||||
{
|
||||
int startpos = 0;
|
||||
Val* predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, convert_error);
|
||||
zeek::Val* predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, convert_error);
|
||||
|
||||
if ( convert_error )
|
||||
{
|
||||
|
|
@ -1326,9 +1326,9 @@ void Manager::EndCurrentSend(ReaderFrontend* reader)
|
|||
|
||||
while ( ( ih = stream->lastDict->NextEntry(lastDictIdxKey, c) ) )
|
||||
{
|
||||
ValPtr val;
|
||||
ValPtr predidx;
|
||||
EnumValPtr ev;
|
||||
zeek::ValPtr val;
|
||||
zeek::ValPtr predidx;
|
||||
zeek::EnumValPtr ev;
|
||||
int startpos = 0;
|
||||
|
||||
if ( stream->pred || stream->event )
|
||||
|
|
@ -1404,8 +1404,8 @@ void Manager::SendEndOfData(const Stream *i)
|
|||
DBG_LOG(DBG_INPUT, "SendEndOfData for stream %s",
|
||||
i->name.c_str());
|
||||
#endif
|
||||
SendEvent(end_of_data, 2, new StringVal(i->name.c_str()),
|
||||
new StringVal(i->reader->Info().source));
|
||||
SendEvent(end_of_data, 2, new zeek::StringVal(i->name.c_str()),
|
||||
new zeek::StringVal(i->reader->Info().source));
|
||||
|
||||
if ( i->stream_type == ANALYSIS_STREAM )
|
||||
file_mgr->EndOfFile(static_cast<const AnalysisStream*>(i)->file_id);
|
||||
|
|
@ -1451,14 +1451,14 @@ void Manager::Put(ReaderFrontend* reader, Value* *vals)
|
|||
Value::delete_value_ptr_array(vals, readFields);
|
||||
}
|
||||
|
||||
int Manager::SendEventStreamEvent(Stream* i, EnumVal* type, const Value* const *vals)
|
||||
int Manager::SendEventStreamEvent(Stream* i, zeek::EnumVal* type, const Value* const *vals)
|
||||
{
|
||||
assert(i);
|
||||
|
||||
assert(i->stream_type == EVENT_STREAM);
|
||||
EventStream* stream = (EventStream*) i;
|
||||
|
||||
list<Val*> out_vals;
|
||||
list<zeek::Val*> out_vals;
|
||||
Ref(stream->description);
|
||||
out_vals.push_back(stream->description);
|
||||
// no tracking, send everything with a new event...
|
||||
|
|
@ -1470,7 +1470,7 @@ int Manager::SendEventStreamEvent(Stream* i, EnumVal* type, const Value* const *
|
|||
|
||||
if ( stream->want_record )
|
||||
{
|
||||
RecordVal * r = ValueToRecordVal(i, vals, stream->fields, &position, convert_error);
|
||||
zeek::RecordVal * r = ValueToRecordVal(i, vals, stream->fields, &position, convert_error);
|
||||
out_vals.push_back(r);
|
||||
}
|
||||
|
||||
|
|
@ -1478,7 +1478,7 @@ int Manager::SendEventStreamEvent(Stream* i, EnumVal* type, const Value* const *
|
|||
{
|
||||
for ( int j = 0; j < stream->fields->NumFields(); j++)
|
||||
{
|
||||
Val* val = nullptr;
|
||||
zeek::Val* val = nullptr;
|
||||
|
||||
if ( stream->fields->GetFieldType(j)->Tag() == zeek::TYPE_RECORD )
|
||||
val = ValueToRecordVal(i, vals,
|
||||
|
|
@ -1498,7 +1498,7 @@ int Manager::SendEventStreamEvent(Stream* i, EnumVal* type, const Value* const *
|
|||
if ( convert_error )
|
||||
{
|
||||
// we have an error somewhere in our out_vals. Just delete all of them.
|
||||
for ( list<Val*>::const_iterator it = out_vals.begin(), end = out_vals.end(); it != end; ++it )
|
||||
for ( list<zeek::Val*>::const_iterator it = out_vals.begin(), end = out_vals.end(); it != end; ++it )
|
||||
Unref(*it);
|
||||
}
|
||||
else
|
||||
|
|
@ -1516,8 +1516,8 @@ int Manager::PutTable(Stream* i, const Value* const *vals)
|
|||
|
||||
bool convert_error = false;
|
||||
|
||||
Val* idxval = ValueToIndexVal(i, stream->num_idx_fields, stream->itype, vals, convert_error);
|
||||
Val* valval;
|
||||
zeek::Val* idxval = ValueToIndexVal(i, stream->num_idx_fields, stream->itype, vals, convert_error);
|
||||
zeek::Val* valval;
|
||||
|
||||
int position = stream->num_idx_fields;
|
||||
|
||||
|
|
@ -1541,7 +1541,7 @@ int Manager::PutTable(Stream* i, const Value* const *vals)
|
|||
if ( stream->pred || stream->event )
|
||||
{
|
||||
bool updated = false;
|
||||
ValPtr oldval;
|
||||
zeek::ValPtr oldval;
|
||||
|
||||
if ( stream->num_val_fields > 0 )
|
||||
{
|
||||
|
|
@ -1559,10 +1559,10 @@ int Manager::PutTable(Stream* i, const Value* const *vals)
|
|||
// predicate if we want the update or not
|
||||
if ( stream->pred )
|
||||
{
|
||||
EnumValPtr ev;
|
||||
zeek::EnumValPtr ev;
|
||||
int startpos = 0;
|
||||
bool pred_convert_error = false;
|
||||
Val* predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, pred_convert_error);
|
||||
zeek::Val* predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, pred_convert_error);
|
||||
|
||||
if ( pred_convert_error )
|
||||
Unref(predidx);
|
||||
|
|
@ -1599,7 +1599,7 @@ int Manager::PutTable(Stream* i, const Value* const *vals)
|
|||
{
|
||||
int startpos = 0;
|
||||
bool event_convert_error = false;
|
||||
Val* predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, event_convert_error);
|
||||
zeek::Val* predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, event_convert_error);
|
||||
|
||||
if ( event_convert_error )
|
||||
Unref(predidx);
|
||||
|
|
@ -1677,7 +1677,7 @@ bool Manager::Delete(ReaderFrontend* reader, Value* *vals)
|
|||
{
|
||||
TableStream* stream = (TableStream*) i;
|
||||
bool convert_error = false;
|
||||
Val* idxval = ValueToIndexVal(i, stream->num_idx_fields, stream->itype, vals, convert_error);
|
||||
zeek::Val* idxval = ValueToIndexVal(i, stream->num_idx_fields, stream->itype, vals, convert_error);
|
||||
assert(idxval != nullptr);
|
||||
readVals = stream->num_idx_fields + stream->num_val_fields;
|
||||
bool streamresult = true;
|
||||
|
|
@ -1695,7 +1695,7 @@ bool Manager::Delete(ReaderFrontend* reader, Value* *vals)
|
|||
if ( stream->pred )
|
||||
{
|
||||
int startpos = 0;
|
||||
Val* predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, convert_error);
|
||||
zeek::Val* predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, convert_error);
|
||||
|
||||
if ( convert_error )
|
||||
Unref(predidx);
|
||||
|
|
@ -1765,7 +1765,7 @@ bool Manager::CallPred(Func* pred_func, const int numvals, ...) const
|
|||
va_list lP;
|
||||
va_start(lP, numvals);
|
||||
for ( int i = 0; i < numvals; i++ )
|
||||
vl.emplace_back(zeek::AdoptRef{}, va_arg(lP, Val*));
|
||||
vl.emplace_back(zeek::AdoptRef{}, va_arg(lP, zeek::Val*));
|
||||
|
||||
va_end(lP);
|
||||
|
||||
|
|
@ -1790,7 +1790,7 @@ void Manager::SendEvent(EventHandlerPtr ev, const int numvals, ...) const
|
|||
va_list lP;
|
||||
va_start(lP, numvals);
|
||||
for ( int i = 0; i < numvals; i++ )
|
||||
vl.emplace_back(zeek::AdoptRef{}, va_arg(lP, Val*));
|
||||
vl.emplace_back(zeek::AdoptRef{}, va_arg(lP, zeek::Val*));
|
||||
|
||||
va_end(lP);
|
||||
|
||||
|
|
@ -1798,7 +1798,7 @@ void Manager::SendEvent(EventHandlerPtr ev, const int numvals, ...) const
|
|||
mgr.Enqueue(ev, std::move(vl), SOURCE_LOCAL);
|
||||
}
|
||||
|
||||
void Manager::SendEvent(EventHandlerPtr ev, list<Val*> events) const
|
||||
void Manager::SendEvent(EventHandlerPtr ev, list<zeek::Val*> events) const
|
||||
{
|
||||
zeek::Args vl;
|
||||
vl.reserve(events.size());
|
||||
|
|
@ -1808,7 +1808,7 @@ void Manager::SendEvent(EventHandlerPtr ev, list<Val*> events) const
|
|||
events.size());
|
||||
#endif
|
||||
|
||||
for ( list<Val*>::iterator i = events.begin(); i != events.end(); i++ )
|
||||
for ( list<zeek::Val*>::iterator i = events.begin(); i != events.end(); i++ )
|
||||
vl.emplace_back(zeek::AdoptRef{}, *i);
|
||||
|
||||
if ( ev )
|
||||
|
|
@ -1817,11 +1817,11 @@ void Manager::SendEvent(EventHandlerPtr ev, list<Val*> events) const
|
|||
|
||||
// Convert a bro list value to a bro record value.
|
||||
// I / we could think about moving this functionality to val.cc
|
||||
RecordVal* Manager::ListValToRecordVal(ListVal* list, zeek::RecordType *request_type, int* position) const
|
||||
zeek::RecordVal* Manager::ListValToRecordVal(zeek::ListVal* list, zeek::RecordType *request_type, int* position) const
|
||||
{
|
||||
assert(position != nullptr); // we need the pointer to point to data;
|
||||
|
||||
RecordVal* rec = new RecordVal({zeek::NewRef{}, request_type});
|
||||
auto* rec = new zeek::RecordVal({zeek::NewRef{}, request_type});
|
||||
|
||||
assert(list != nullptr);
|
||||
int maxpos = list->Length();
|
||||
|
|
@ -1830,7 +1830,7 @@ RecordVal* Manager::ListValToRecordVal(ListVal* list, zeek::RecordType *request_
|
|||
{
|
||||
assert ( (*position) <= maxpos );
|
||||
|
||||
Val* fieldVal = nullptr;
|
||||
zeek::Val* fieldVal = nullptr;
|
||||
if ( request_type->GetFieldType(i)->Tag() == zeek::TYPE_RECORD )
|
||||
fieldVal = ListValToRecordVal(list, request_type->GetFieldType(i)->AsRecordType(), position);
|
||||
else
|
||||
|
|
@ -1846,15 +1846,15 @@ RecordVal* Manager::ListValToRecordVal(ListVal* list, zeek::RecordType *request_
|
|||
}
|
||||
|
||||
// Convert a threading value to a record value
|
||||
RecordVal* Manager::ValueToRecordVal(const Stream* stream, const Value* const *vals,
|
||||
zeek::RecordType *request_type, int* position, bool& have_error) const
|
||||
zeek::RecordVal* Manager::ValueToRecordVal(const Stream* stream, const Value* const *vals,
|
||||
zeek::RecordType *request_type, int* position, bool& have_error) const
|
||||
{
|
||||
assert(position != nullptr); // we need the pointer to point to data.
|
||||
|
||||
RecordVal* rec = new RecordVal({zeek::NewRef{}, request_type});
|
||||
auto* rec = new zeek::RecordVal({zeek::NewRef{}, request_type});
|
||||
for ( int i = 0; i < request_type->NumFields(); i++ )
|
||||
{
|
||||
Val* fieldVal = nullptr;
|
||||
zeek::Val* fieldVal = nullptr;
|
||||
if ( request_type->GetFieldType(i)->Tag() == zeek::TYPE_RECORD )
|
||||
fieldVal = ValueToRecordVal(stream, vals, request_type->GetFieldType(i)->AsRecordType(), position, have_error);
|
||||
else if ( request_type->GetFieldType(i)->Tag() == zeek::TYPE_FILE ||
|
||||
|
|
@ -2159,7 +2159,7 @@ HashKey* Manager::HashValues(const int num_elements, const Value* const *vals) c
|
|||
// have_error is a reference to a boolean which is set to true as soon as an error occurs.
|
||||
// When have_error is set to true at the beginning of the function, it is assumed that
|
||||
// an error already occurred in the past and processing is aborted.
|
||||
Val* Manager::ValueToVal(const Stream* i, const Value* val, zeek::Type* request_type, bool& have_error) const
|
||||
zeek::Val* Manager::ValueToVal(const Stream* i, const Value* val, zeek::Type* request_type, bool& have_error) const
|
||||
{
|
||||
if ( have_error )
|
||||
return nullptr;
|
||||
|
|
@ -2185,18 +2185,18 @@ Val* Manager::ValueToVal(const Stream* i, const Value* val, zeek::Type* request_
|
|||
return val_mgr->Count(val->val.int_val).release();
|
||||
|
||||
case zeek::TYPE_DOUBLE:
|
||||
return new DoubleVal(val->val.double_val);
|
||||
return new zeek::DoubleVal(val->val.double_val);
|
||||
|
||||
case zeek::TYPE_TIME:
|
||||
return new TimeVal(val->val.double_val);
|
||||
return new zeek::TimeVal(val->val.double_val);
|
||||
|
||||
case zeek::TYPE_INTERVAL:
|
||||
return new IntervalVal(val->val.double_val);
|
||||
return new zeek::IntervalVal(val->val.double_val);
|
||||
|
||||
case zeek::TYPE_STRING:
|
||||
{
|
||||
BroString *s = new BroString((const u_char*)val->val.string_val.data, val->val.string_val.length, true);
|
||||
return new StringVal(s);
|
||||
return new zeek::StringVal(s);
|
||||
}
|
||||
|
||||
case zeek::TYPE_PORT:
|
||||
|
|
@ -2218,7 +2218,7 @@ Val* Manager::ValueToVal(const Stream* i, const Value* val, zeek::Type* request_
|
|||
assert(false);
|
||||
}
|
||||
|
||||
AddrVal* addrval = new AddrVal(*addr);
|
||||
auto* addrval = new zeek::AddrVal(*addr);
|
||||
delete addr;
|
||||
return addrval;
|
||||
}
|
||||
|
|
@ -2239,7 +2239,7 @@ Val* Manager::ValueToVal(const Stream* i, const Value* val, zeek::Type* request_
|
|||
assert(false);
|
||||
}
|
||||
|
||||
SubNetVal* subnetval = new SubNetVal(*addr, val->val.subnet_val.length);
|
||||
auto* subnetval = new zeek::SubNetVal(*addr, val->val.subnet_val.length);
|
||||
delete addr;
|
||||
return subnetval;
|
||||
}
|
||||
|
|
@ -2248,7 +2248,7 @@ Val* Manager::ValueToVal(const Stream* i, const Value* val, zeek::Type* request_
|
|||
{
|
||||
RE_Matcher* re = new RE_Matcher(val->val.pattern_text_val);
|
||||
re->Compile();
|
||||
return new PatternVal(re);
|
||||
return new zeek::PatternVal(re);
|
||||
}
|
||||
|
||||
case zeek::TYPE_TABLE:
|
||||
|
|
@ -2258,10 +2258,10 @@ Val* Manager::ValueToVal(const Stream* i, const Value* val, zeek::Type* request_
|
|||
auto set_index = zeek::make_intrusive<zeek::TypeList>(type);
|
||||
set_index->Append(type);
|
||||
auto s = zeek::make_intrusive<zeek::SetType>(std::move(set_index), nullptr);
|
||||
TableVal* t = new TableVal(std::move(s));
|
||||
auto* t = new zeek::TableVal(std::move(s));
|
||||
for ( int j = 0; j < val->val.set_val.size; j++ )
|
||||
{
|
||||
Val* assignval = ValueToVal(i, val->val.set_val.vals[j], type.get(), have_error);
|
||||
zeek::Val* assignval = ValueToVal(i, val->val.set_val.vals[j], type.get(), have_error);
|
||||
|
||||
t->Assign({zeek::AdoptRef{}, assignval}, nullptr);
|
||||
}
|
||||
|
|
@ -2274,7 +2274,7 @@ Val* Manager::ValueToVal(const Stream* i, const Value* val, zeek::Type* request_
|
|||
// all entries have to have the same type...
|
||||
const auto& type = request_type->AsVectorType()->Yield();
|
||||
auto vt = zeek::make_intrusive<zeek::VectorType>(type);
|
||||
auto v = zeek::make_intrusive<VectorVal>(std::move(vt));
|
||||
auto v = zeek::make_intrusive<zeek::VectorVal>(std::move(vt));
|
||||
|
||||
for ( int j = 0; j < val->val.vector_val.size; j++ )
|
||||
{
|
||||
|
|
@ -2435,7 +2435,7 @@ void Manager::ErrorHandler(const Stream* i, ErrorType et, bool reporter_send, co
|
|||
// send our script level error event
|
||||
if ( i->error_event )
|
||||
{
|
||||
EnumValPtr ev;
|
||||
zeek::EnumValPtr ev;
|
||||
switch (et)
|
||||
{
|
||||
case ErrorType::INFO:
|
||||
|
|
@ -2455,7 +2455,7 @@ void Manager::ErrorHandler(const Stream* i, ErrorType et, bool reporter_send, co
|
|||
__builtin_unreachable();
|
||||
}
|
||||
|
||||
StringVal* message = new StringVal(buf);
|
||||
auto* message = new zeek::StringVal(buf);
|
||||
SendEvent(i->error_event, 3, i->description->Ref(), message, ev.release());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#include "threading/SerialTypes.h"
|
||||
#include "Tag.h"
|
||||
|
||||
class RecordVal;
|
||||
ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek);
|
||||
|
||||
namespace input {
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ public:
|
|||
* This method corresponds directly to the internal BiF defined in
|
||||
* input.bif, which just forwards here.
|
||||
*/
|
||||
bool CreateTableStream(RecordVal* description);
|
||||
bool CreateTableStream(zeek::RecordVal* description);
|
||||
|
||||
/**
|
||||
* Creates a new input stream which sends events for read input data.
|
||||
|
|
@ -55,7 +55,7 @@ public:
|
|||
* This method corresponds directly to the internal BiF defined in
|
||||
* input.bif, which just forwards here.
|
||||
*/
|
||||
bool CreateEventStream(RecordVal* description);
|
||||
bool CreateEventStream(zeek::RecordVal* description);
|
||||
|
||||
/**
|
||||
* Creates a new input stream which will forward the data from the data
|
||||
|
|
@ -67,7 +67,7 @@ public:
|
|||
* @param description A record of the script type \c
|
||||
* Input::AnalysisDescription
|
||||
*/
|
||||
bool CreateAnalysisStream(RecordVal* description);
|
||||
bool CreateAnalysisStream(zeek::RecordVal* description);
|
||||
|
||||
/**
|
||||
* Force update on a input stream. Forces a re-read of the whole
|
||||
|
|
@ -143,7 +143,7 @@ protected:
|
|||
|
||||
// Instantiates a new ReaderBackend of the given type (note that
|
||||
// doing so creates a new thread!).
|
||||
ReaderBackend* CreateBackend(ReaderFrontend* frontend, EnumVal* tag);
|
||||
ReaderBackend* CreateBackend(ReaderFrontend* frontend, zeek::EnumVal* tag);
|
||||
|
||||
// Function called from the ReaderBackend to notify the manager that
|
||||
// a stream has been removed or a stream has been closed. Used to
|
||||
|
|
@ -180,7 +180,7 @@ private:
|
|||
// protected definitions are wrappers around this function.
|
||||
bool RemoveStream(Stream* i);
|
||||
|
||||
bool CreateStream(Stream*, RecordVal* description);
|
||||
bool CreateStream(Stream*, zeek::RecordVal* description);
|
||||
|
||||
// Check if the types of the error_ev event are correct. If table is
|
||||
// true, check for tablestream type, otherwhise check for eventstream
|
||||
|
|
@ -194,7 +194,7 @@ private:
|
|||
int PutTable(Stream* i, const threading::Value* const *vals);
|
||||
|
||||
// SendEntry and Put implementation for Event stream.
|
||||
int SendEventStreamEvent(Stream* i, EnumVal* type, const threading::Value* const *vals);
|
||||
int SendEventStreamEvent(Stream* i, zeek::EnumVal* type, const threading::Value* const *vals);
|
||||
|
||||
// Check if a record is made up of compatible types and return a list
|
||||
// of all fields that are in the record in order. Recursively unrolls
|
||||
|
|
@ -203,7 +203,7 @@ private:
|
|||
|
||||
// Send events
|
||||
void SendEvent(EventHandlerPtr ev, const int numvals, ...) const;
|
||||
void SendEvent(EventHandlerPtr ev, std::list<Val*> events) const;
|
||||
void SendEvent(EventHandlerPtr ev, std::list<zeek::Val*> events) const;
|
||||
|
||||
// Implementation of SendEndOfData (send end_of_data event).
|
||||
void SendEndOfData(const Stream *i);
|
||||
|
|
@ -222,19 +222,19 @@ private:
|
|||
int CopyValue(char *data, const int startpos, const threading::Value* val) const;
|
||||
|
||||
// Convert Threading::Value to an internal Bro Type (works with Records).
|
||||
Val* ValueToVal(const Stream* i, const threading::Value* val, zeek::Type* request_type, bool& have_error) const;
|
||||
zeek::Val* ValueToVal(const Stream* i, const threading::Value* val, zeek::Type* request_type, bool& have_error) const;
|
||||
|
||||
// Convert Threading::Value to an internal Bro list type.
|
||||
Val* ValueToIndexVal(const Stream* i, int num_fields, const zeek::RecordType* type, const threading::Value* const *vals, bool& have_error) const;
|
||||
zeek::Val* ValueToIndexVal(const Stream* i, int num_fields, const zeek::RecordType* type, const threading::Value* const *vals, bool& have_error) const;
|
||||
|
||||
// Converts a threading::value to a record type. Mostly used by
|
||||
// ValueToVal.
|
||||
RecordVal* ValueToRecordVal(const Stream* i, const threading::Value* const *vals, zeek::RecordType *request_type, int* position, bool& have_error) const;
|
||||
zeek::RecordVal* ValueToRecordVal(const Stream* i, const threading::Value* const *vals, zeek::RecordType *request_type, int* position, bool& have_error) const;
|
||||
|
||||
Val* RecordValToIndexVal(RecordVal *r) const;
|
||||
zeek::Val* RecordValToIndexVal(zeek::RecordVal *r) const;
|
||||
|
||||
// Converts a Bro ListVal to a RecordVal given the record type.
|
||||
RecordVal* ListValToRecordVal(ListVal* list, zeek::RecordType *request_type, int* position) const;
|
||||
zeek::RecordVal* ListValToRecordVal(zeek::ListVal* list, zeek::RecordType *request_type, int* position) const;
|
||||
|
||||
// Internally signal errors, warnings, etc.
|
||||
// These are sent on to input scriptland and reporter.log
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public:
|
|||
bool Process() override { return Object()->Update(); }
|
||||
};
|
||||
|
||||
ReaderFrontend::ReaderFrontend(const ReaderBackend::ReaderInfo& arg_info, EnumVal* type)
|
||||
ReaderFrontend::ReaderFrontend(const ReaderBackend::ReaderInfo& arg_info, zeek::EnumVal* type)
|
||||
{
|
||||
disabled = initialized = false;
|
||||
info = new ReaderBackend::ReaderInfo(arg_info);
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include "ReaderBackend.h"
|
||||
#include "threading/SerialTypes.h"
|
||||
|
||||
class EnumVal;
|
||||
ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek);
|
||||
|
||||
namespace input {
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ public:
|
|||
*
|
||||
* Frontends must only be instantiated by the main thread.
|
||||
*/
|
||||
ReaderFrontend(const ReaderBackend::ReaderInfo& info, EnumVal* type);
|
||||
ReaderFrontend(const ReaderBackend::ReaderInfo& info, zeek::EnumVal* type);
|
||||
|
||||
/**
|
||||
* Destructor.
|
||||
|
|
|
|||
|
|
@ -16,20 +16,20 @@ input::Tag& input::Tag::operator=(const input::Tag& other)
|
|||
return *this;
|
||||
}
|
||||
|
||||
const EnumValPtr& input::Tag::AsVal() const
|
||||
const zeek::EnumValPtr& input::Tag::AsVal() const
|
||||
{
|
||||
return ::Tag::AsVal(input_mgr->GetTagType());
|
||||
}
|
||||
|
||||
EnumVal* input::Tag::AsEnumVal() const
|
||||
zeek::EnumVal* input::Tag::AsEnumVal() const
|
||||
{
|
||||
return AsVal().get();
|
||||
}
|
||||
|
||||
input::Tag::Tag(EnumValPtr val)
|
||||
input::Tag::Tag(zeek::EnumValPtr val)
|
||||
: ::Tag(std::move(val))
|
||||
{ }
|
||||
|
||||
input::Tag::Tag(EnumVal* val)
|
||||
input::Tag::Tag(zeek::EnumVal* val)
|
||||
: ::Tag({zeek::NewRef{}, val})
|
||||
{ }
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include "zeek-config.h"
|
||||
#include "../Tag.h"
|
||||
|
||||
class EnumVal;
|
||||
ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek);
|
||||
|
||||
namespace zeek::plugin {
|
||||
template <class T> class TaggedComponent;
|
||||
|
|
@ -89,10 +89,10 @@ public:
|
|||
*
|
||||
* @param etype the script-layer enum type associated with the tag.
|
||||
*/
|
||||
const EnumValPtr& AsVal() const;
|
||||
const zeek::EnumValPtr& AsVal() const;
|
||||
|
||||
[[deprecated("Remove in v4.1. Use AsVal() instead.")]]
|
||||
EnumVal* AsEnumVal() const;
|
||||
zeek::EnumVal* AsEnumVal() const;
|
||||
|
||||
static const Tag Error;
|
||||
|
||||
|
|
@ -117,10 +117,10 @@ protected:
|
|||
*
|
||||
* @param val An enum value of script type \c Input::Reader.
|
||||
*/
|
||||
explicit Tag(EnumValPtr val);
|
||||
explicit Tag(zeek::EnumValPtr val);
|
||||
|
||||
[[deprecated("Remove in v4.1. Construct from IntrusivePtr isntead.")]]
|
||||
explicit Tag(EnumVal* val);
|
||||
explicit Tag(zeek::EnumVal* val);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue