Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 16:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/158-packet-filter-option'

Browse source 
* origin/topic/timw/158-packet-filter-option:
  GH-158: Ensure packet-filter framework is loaded if -f option is passed
This commit is contained in:
Jon Siwek 2020-08-27 15:34:14 -07:00
commit 5b25870c83
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.3.0-dev.210 | 2020-08-27 15:34:14 -0700
* GH-158: Ensure packet-filter framework is loaded if -f option is passed (Tim Wojtulewicz, Corelight)
3.3.0-dev.208 | 2020-08-27 11:12:22 -0700
* GH-1145: Fix a umask issue for processing-status file (Vlad Grigorescu)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.208
3.3.0-dev.210

3
src/zeek-setup.cc
View file

@ -566,6 +566,9 @@ SetupResult setup(int argc, char** argv,
for ( const auto& script : options.scripts_to_load )
add_input_file(script.data());
if ( options.pcap_filter )
add_input_file("base/frameworks/packet-filter/main.zeek");
push_scope(nullptr, nullptr);
dns_mgr = new DNS_Mgr(dns_type);