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

Merge remote-tracking branch 'origin/topic/robin/gh-1757-loadfile2'

Browse source 
* origin/topic/robin/gh-1757-loadfile2:
  Tweaking a couple of debug message.
  Add new hook `HookLoadFileExtended` that allows plugins to supply Zeek script code to parse.
  Move logic to execute `HookLoadFile` for signatures into rule matcher code.
This commit is contained in:
Robin Sommer 2021-11-10 11:16:28 +01:00
commit 1bb21bfcb4
26 changed files with 1621 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/zeek-setup.cc
View file

@ -737,7 +737,11 @@ SetupResult setup(int argc, char** argv, Options* zopts)
id->SetVal(make_intrusive<StringVal>(*options.pcap_filter));
}
auto all_signature_files = options.signature_files;
std::vector<SignatureFile> all_signature_files;
// Append signature files given on the command line
for ( const auto& sf : options.signature_files )
all_signature_files.emplace_back(sf);
// Append signature files defined in "signature_files" script option
for ( auto&& sf : get_script_signature_files() )