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

* 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

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);