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

zeek-setup: Load builtin-plugins/__preload__.zeek before initializing bifs

Browse source 
Prevent errors as follows with the bro-http2 plugin.

    error in /mitrecnd_HTTP2.events.bif.zeek, line 95: identifier not defined: http2_stream_stat
    error in /mitrecnd_HTTP2.events.bif.zeek, line 363: identifier not defined: http2_settings
    internal error in /mitrecnd_HTTP2.events.bif.zeek, line 460: Failed to find type named: http2_settings_unrecognized_table
This commit is contained in:
Arne Welzel 2022-11-02 09:52:58 +01:00
parent 1fecdfd815
commit d34167b2c4
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/zeek-setup.cc
View file

@ -648,6 +648,7 @@ SetupResult setup(int argc, char** argv, Options* zopts)
zeekygen_mgr = new zeekygen::detail::Manager(zeekygen_cfg, zeek_argv[0]); zeekygen_mgr = new zeekygen::detail::Manager(zeekygen_cfg, zeek_argv[0]);
add_essential_input_file("base/init-bare.zeek"); add_essential_input_file("base/init-bare.zeek");
add_essential_input_file("builtin-plugins/__preload__.zeek");
add_essential_input_file("base/init-frameworks-and-bifs.zeek"); add_essential_input_file("base/init-frameworks-and-bifs.zeek");
if ( ! options.bare_mode ) if ( ! options.bare_mode )
@ -660,7 +661,6 @@ SetupResult setup(int argc, char** argv, Options* zopts)
add_input_file("base/init-default.zeek"); add_input_file("base/init-default.zeek");
} }
add_input_file("builtin-plugins/__preload__.zeek");
add_input_file("builtin-plugins/__load__.zeek"); add_input_file("builtin-plugins/__load__.zeek");
plugin_mgr->SearchDynamicPlugins(util::zeek_plugin_path()); plugin_mgr->SearchDynamicPlugins(util::zeek_plugin_path());

4
testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
View file

@ -82,6 +82,8 @@ scripts/base/init-bare.zeek
scripts/base/packet-protocols/gtpv1/__load__.zeek scripts/base/packet-protocols/gtpv1/__load__.zeek
scripts/base/packet-protocols/gtpv1/main.zeek scripts/base/packet-protocols/gtpv1/main.zeek
build/scripts/base/bif/plugins/Zeek_GTPv1.functions.bif.zeek build/scripts/base/bif/plugins/Zeek_GTPv1.functions.bif.zeek
build/scripts/builtin-plugins/__preload__.zeek
build/scripts/builtin-plugins/Zeek_Spicy/__preload__.zeek
scripts/base/init-frameworks-and-bifs.zeek scripts/base/init-frameworks-and-bifs.zeek
scripts/base/frameworks/logging/__load__.zeek scripts/base/frameworks/logging/__load__.zeek
scripts/base/frameworks/logging/main.zeek scripts/base/frameworks/logging/main.zeek
@ -247,8 +249,6 @@ scripts/base/init-frameworks-and-bifs.zeek
build/scripts/base/bif/plugins/Zeek_Spicy.consts.bif.zeek build/scripts/base/bif/plugins/Zeek_Spicy.consts.bif.zeek
build/scripts/base/bif/plugins/Zeek_Spicy.events.bif.zeek build/scripts/base/bif/plugins/Zeek_Spicy.events.bif.zeek
build/scripts/base/bif/plugins/Zeek_Spicy.functions.bif.zeek build/scripts/base/bif/plugins/Zeek_Spicy.functions.bif.zeek
build/scripts/builtin-plugins/__preload__.zeek
build/scripts/builtin-plugins/Zeek_Spicy/__preload__.zeek
build/scripts/builtin-plugins/__load__.zeek build/scripts/builtin-plugins/__load__.zeek
build/scripts/builtin-plugins/Zeek_Spicy/__load__.zeek build/scripts/builtin-plugins/Zeek_Spicy/__load__.zeek
build/scripts/builtin-plugins/Zeek_Spicy/Zeek/Spicy/bare.zeek build/scripts/builtin-plugins/Zeek_Spicy/Zeek/Spicy/bare.zeek

4
testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
View file

@ -82,6 +82,8 @@ scripts/base/init-bare.zeek
scripts/base/packet-protocols/gtpv1/__load__.zeek scripts/base/packet-protocols/gtpv1/__load__.zeek
scripts/base/packet-protocols/gtpv1/main.zeek scripts/base/packet-protocols/gtpv1/main.zeek
build/scripts/base/bif/plugins/Zeek_GTPv1.functions.bif.zeek build/scripts/base/bif/plugins/Zeek_GTPv1.functions.bif.zeek
build/scripts/builtin-plugins/__preload__.zeek
build/scripts/builtin-plugins/Zeek_Spicy/__preload__.zeek
scripts/base/init-frameworks-and-bifs.zeek scripts/base/init-frameworks-and-bifs.zeek
scripts/base/frameworks/logging/__load__.zeek scripts/base/frameworks/logging/__load__.zeek
scripts/base/frameworks/logging/main.zeek scripts/base/frameworks/logging/main.zeek
@ -447,8 +449,6 @@ scripts/base/init-default.zeek
scripts/base/misc/find-checksum-offloading.zeek scripts/base/misc/find-checksum-offloading.zeek
scripts/base/misc/find-filtered-trace.zeek scripts/base/misc/find-filtered-trace.zeek
build/scripts/base/misc/installation.zeek build/scripts/base/misc/installation.zeek
build/scripts/builtin-plugins/__preload__.zeek
build/scripts/builtin-plugins/Zeek_Spicy/__preload__.zeek
build/scripts/builtin-plugins/__load__.zeek build/scripts/builtin-plugins/__load__.zeek
build/scripts/builtin-plugins/Zeek_Spicy/__load__.zeek build/scripts/builtin-plugins/Zeek_Spicy/__load__.zeek
build/scripts/builtin-plugins/Zeek_Spicy/Zeek/Spicy/bare.zeek build/scripts/builtin-plugins/Zeek_Spicy/Zeek/Spicy/bare.zeek