Move all Val classes to the zeek namespaces

This commit is contained in:
Tim Wojtulewicz 2020-06-24 16:55:28 -04:00
parent ec9eff0bd5
commit 64332ca22c
265 changed files with 3154 additions and 3086 deletions

View file

@ -11,7 +11,7 @@
using namespace file_analysis;
DataEvent::DataEvent(RecordValPtr args, File* file,
DataEvent::DataEvent(zeek::RecordValPtr args, File* file,
EventHandlerPtr ce, EventHandlerPtr se)
: file_analysis::Analyzer(file_mgr->GetComponentTag("DATA_EVENT"),
std::move(args), file),
@ -19,7 +19,7 @@ DataEvent::DataEvent(RecordValPtr args, File* file,
{
}
file_analysis::Analyzer* DataEvent::Instantiate(RecordValPtr args,
file_analysis::Analyzer* DataEvent::Instantiate(zeek::RecordValPtr args,
File* file)
{
const auto& chunk_val = args->GetField("chunk_event");
@ -44,9 +44,9 @@ bool DataEvent::DeliverChunk(const u_char* data, uint64_t len, uint64_t offset)
if ( ! chunk_event ) return true;
mgr.Enqueue(chunk_event,
GetFile()->ToVal(),
zeek::make_intrusive<StringVal>(new BroString(data, len, false)),
val_mgr->Count(offset)
GetFile()->ToVal(),
zeek::make_intrusive<zeek::StringVal>(new BroString(data, len, false)),
val_mgr->Count(offset)
);
return true;
@ -57,8 +57,8 @@ bool DataEvent::DeliverStream(const u_char* data, uint64_t len)
if ( ! stream_event ) return true;
mgr.Enqueue(stream_event,
GetFile()->ToVal(),
zeek::make_intrusive<StringVal>(new BroString(data, len, false))
GetFile()->ToVal(),
zeek::make_intrusive<zeek::StringVal>(new BroString(data, len, false))
);
return true;

View file

@ -43,7 +43,7 @@ public:
* @return the new DataEvent analyzer instance or a null pointer if
* no "chunk_event" or "stream_event" field was specfied in \a args.
*/
static file_analysis::Analyzer* Instantiate(RecordValPtr args,
static file_analysis::Analyzer* Instantiate(zeek::RecordValPtr args,
File* file);
protected:
@ -57,7 +57,7 @@ protected:
* @param se pointer to event handler which will be called to receive
* sequential file data.
*/
DataEvent(RecordValPtr args, File* file,
DataEvent(zeek::RecordValPtr args, File* file,
EventHandlerPtr ce, EventHandlerPtr se);
private: