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

Deprecate file_analysis::Analyzer::Args(), replace with GetArgs()

Browse source
This commit is contained in:
Jon Siwek 2020-05-22 12:34:40 -07:00
parent faa4738807
commit ecb7c7c27e
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/file_analysis/Analyzer.cc
View file

@ -10,7 +10,6 @@ file_analysis::Analyzer::~Analyzer()
{ {
DBG_LOG(DBG_FILE_ANALYSIS, "Destroy file analyzer %s", DBG_LOG(DBG_FILE_ANALYSIS, "Destroy file analyzer %s",
file_mgr->GetComponentName(tag).c_str()); file_mgr->GetComponentName(tag).c_str());
Unref(args);
} }
void file_analysis::Analyzer::SetAnalyzerTag(const file_analysis::Tag& arg_tag) void file_analysis::Analyzer::SetAnalyzerTag(const file_analysis::Tag& arg_tag)
@ -21,7 +20,7 @@ void file_analysis::Analyzer::SetAnalyzerTag(const file_analysis::Tag& arg_tag)
file_analysis::Analyzer::Analyzer(file_analysis::Tag arg_tag, RecordVal* arg_args, File* arg_file) file_analysis::Analyzer::Analyzer(file_analysis::Tag arg_tag, RecordVal* arg_args, File* arg_file)
: tag(arg_tag), : tag(arg_tag),
args(arg_args->Ref()->AsRecordVal()), args({NewRef{}, arg_args}),
file(arg_file), file(arg_file),
got_stream_delivery(false), got_stream_delivery(false),
skip(false) skip(false)

9
src/file_analysis/Analyzer.h
View file

@ -95,7 +95,12 @@ public:
/** /**
* @return the AnalyzerArgs associated with the analyzer. * @return the AnalyzerArgs associated with the analyzer.
*/ */
RecordVal* Args() const { return args; } const IntrusivePtr<RecordVal>& GetArgs() const
{ return args; }
[[deprecated("Remove in v4.1. Use GetArgs().")]]
RecordVal* Args() const
{ return args.get(); }
/** /**
* @return the file_analysis::File object to which the analyzer is attached. * @return the file_analysis::File object to which the analyzer is attached.
@ -166,7 +171,7 @@ private:
ID id; /**< Unique instance ID. */ ID id; /**< Unique instance ID. */
file_analysis::Tag tag; /**< The particular type of the analyzer instance. */ file_analysis::Tag tag; /**< The particular type of the analyzer instance. */
RecordVal* args; /**< \c AnalyzerArgs val gives tunable analyzer params. */ IntrusivePtr<RecordVal> args; /**< \c AnalyzerArgs val gives tunable analyzer params. */
File* file; /**< The file to which the analyzer is attached. */ File* file; /**< The file to which the analyzer is attached. */
bool got_stream_delivery; bool got_stream_delivery;
bool skip; bool skip;

10
src/file_analysis/File.cc
View file

@ -410,7 +410,7 @@ void File::DeliverStream(const u_char* data, uint64_t len)
bof_buffer.chunks[i]->Len()) ) bof_buffer.chunks[i]->Len()) )
{ {
a->SetSkip(true); a->SetSkip(true);
analyzers.QueueRemove(a->Tag(), a->Args()); analyzers.QueueRemove(a->Tag(), a->GetArgs().get());
} }
} }
@ -427,7 +427,7 @@ void File::DeliverStream(const u_char* data, uint64_t len)
if ( ! a->DeliverStream(data, len) ) if ( ! a->DeliverStream(data, len) )
{ {
a->SetSkip(true); a->SetSkip(true);
analyzers.QueueRemove(a->Tag(), a->Args()); analyzers.QueueRemove(a->Tag(), a->GetArgs().get());
} }
} }
} }
@ -498,7 +498,7 @@ void File::DeliverChunk(const u_char* data, uint64_t len, uint64_t offset)
if ( ! a->DeliverChunk(data, len, offset) ) if ( ! a->DeliverChunk(data, len, offset) )
{ {
a->SetSkip(true); a->SetSkip(true);
analyzers.QueueRemove(a->Tag(), a->Args()); analyzers.QueueRemove(a->Tag(), a->GetArgs().get());
} }
} }
} }
@ -557,7 +557,7 @@ void File::EndOfFile()
while ( (a = analyzers.NextEntry(c)) ) while ( (a = analyzers.NextEntry(c)) )
{ {
if ( ! a->EndOfFile() ) if ( ! a->EndOfFile() )
analyzers.QueueRemove(a->Tag(), a->Args()); analyzers.QueueRemove(a->Tag(), a->GetArgs().get());
} }
FileEvent(file_state_remove); FileEvent(file_state_remove);
@ -590,7 +590,7 @@ void File::Gap(uint64_t offset, uint64_t len)
while ( (a = analyzers.NextEntry(c)) ) while ( (a = analyzers.NextEntry(c)) )
{ {
if ( ! a->Undelivered(offset, len) ) if ( ! a->Undelivered(offset, len) )
analyzers.QueueRemove(a->Tag(), a->Args()); analyzers.QueueRemove(a->Tag(), a->GetArgs().get());
} }
if ( FileEventAvailable(file_gap) ) if ( FileEventAvailable(file_gap) )

2
src/file_analysis/analyzer/extract/Extract.cc
View file

@ -93,7 +93,7 @@ bool Extract::DeliverStream(const u_char* data, uint64_t len)
File* f = GetFile(); File* f = GetFile();
f->FileEvent(file_extraction_limit, { f->FileEvent(file_extraction_limit, {
f->ToVal(), f->ToVal(),
IntrusivePtr{NewRef{}, Args()}, GetArgs(),
val_mgr->Count(limit), val_mgr->Count(limit),
val_mgr->Count(len) val_mgr->Count(len)
}); });