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

Remove APIs that were explicitly deprecated to be removed in 3.1.

Browse source 
Special handling for bro_{init,done,script_loaded} events: if still
used, they cause Zeek to abort at startup.
This commit is contained in:
Robin Sommer 2020-01-27 11:43:07 +00:00
parent 84b8ee3b06
commit d0b206fa36
21 changed files with 29 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testing/btest/Baseline/bifs.str_shell_escape/out
View file

@ -1,4 +0,0 @@
24
echo ${TEST} > "my file"
27
echo \${TEST} > \"my file\"

1
testing/btest/Baseline/coverage.bare-mode-errors/errors
View file

@ -1 +0,0 @@
warning in /Users/tim/Desktop/projects/zeek/testing/btest/../../scripts//base/utils/json.zeek, line 2: deprecated script loaded from command line arguments ="Remove in 3.1. to_json is now always available as a built-in function."

1
testing/btest/Baseline/coverage.init-default/missing_loads
View file

@ -8,4 +8,3 @@
-./frameworks/openflow/cluster.zeek
-./frameworks/packet-filter/cluster.zeek
-./frameworks/sumstats/cluster.zeek
-./utils/json.zeek

12
testing/btest/Baseline/language.zeek_init/out
View file

@ -1,8 +1,4 @@
zeek_init at priority 10!
bro_init at priority 5!
zeek_init at priority 0!
bro_init at priority -10!
zeek_done at priority 10!
bro_done at priority 5!
zeek_done at priority 0!
bro_done at priority -10!
error in /home/robin/bro/master/testing/btest/.tmp/language.zeek_init/zeek_init.zeek, line 10: event bro_init() is no longer available, use zeek_init() instead
error in /home/robin/bro/master/testing/btest/.tmp/language.zeek_init/zeek_init.zeek, line 20: event bro_init() is no longer available, use zeek_init() instead
error in /home/robin/bro/master/testing/btest/.tmp/language.zeek_init/zeek_init.zeek, line 31: event bro_done() is no longer available, use zeek_done() instead
error in /home/robin/bro/master/testing/btest/.tmp/language.zeek_init/zeek_init.zeek, line 41: event bro_done() is no longer available, use zeek_done() instead

6
testing/btest/Baseline/language.zeek_script_loaded/out
View file

@ -1,4 +1,2 @@
zeek_script_loaded priority 10
bro_script_loaded priority 5
zeek_script_loaded priority 0
bro_script_loaded priority -10
error in /home/robin/bro/master/testing/btest/.tmp/language.zeek_script_loaded/zeek_script_loaded.zeek, line 11: event bro_script_loaded() is no longer available, use zeek_script_loaded() instead
error in /home/robin/bro/master/testing/btest/.tmp/language.zeek_script_loaded/zeek_script_loaded.zeek, line 23: event bro_script_loaded() is no longer available, use zeek_script_loaded() instead

15
testing/btest/bifs/str_shell_escape.zeek
View file

@ -1,15 +0,0 @@
#
# @TEST-EXEC: zeek -b %INPUT >out
# @TEST-EXEC: btest-diff out
event zeek_init()
{
local a = "echo ${TEST} > \"my file\"";
print |a|;
print a;
local b = str_shell_escape(a);
print |b|;
print b;
}

8
testing/btest/failed Normal file
View file

@ -0,0 +1,8 @@
bifs.str_shell_escape
core.load-explicit-bro-suffix-fallback
coverage.init-default
language.zeek_init
language.zeek_script_loaded
plugins.legacy
coverage.sphinx-zeekygen-docs
coverage.bare-mode-errors

5
testing/btest/language/zeek_init.zeek
View file

@ -1,6 +1,5 @@
# @TEST-EXEC: zeek -b %INPUT >out
# @TEST-EXEC: btest-diff out
# @TEST-EXEC-FAIL: zeek -b %INPUT >out 2>&1
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
event zeek_init() &priority=10
{

4
testing/btest/language/zeek_script_loaded.zeek
View file

@ -1,5 +1,5 @@
# @TEST-EXEC: zeek -b %INPUT >out
# @TEST-EXEC: btest-diff out
# @TEST-EXEC-FAIL: zeek -b %INPUT >out 2>&1
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
event zeek_script_loaded(path: string, level: count) &priority=10
{