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

Fix @unload'd files from generating bro_script_loaded event.

Browse source
This commit is contained in:
Jon Siwek 2011-07-20 15:56:25 -05:00
parent 089b822302
commit 0dd1a1e21e
3 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main.cc
View file

@ -962,6 +962,7 @@ int main(int argc, char** argv)
// Queue events reporting loaded scripts. // Queue events reporting loaded scripts.
for ( std::list<ScannedFile>::iterator i = files_scanned.begin(); i != files_scanned.end(); i++ ) for ( std::list<ScannedFile>::iterator i = files_scanned.begin(); i != files_scanned.end(); i++ )
{ {
if ( i->skipped ) continue;
val_list* vl = new val_list; val_list* vl = new val_list;
vl->append(new StringVal(i->name.c_str())); vl->append(new StringVal(i->name.c_str()));
vl->append(new Val(i->include_level, TYPE_COUNT)); vl->append(new Val(i->include_level, TYPE_COUNT));

24
testing/btest/Baseline/core.load-unload/loaded_scripts.log
View file

@ -1,24 +0,0 @@
# depth name
0 /Users/seth/bro.git9/policy/bro.init
1 /Users/seth/bro.git9/build/src/const.bif.bro
1 /Users/seth/bro.git9/build/src/types.bif.bro
1 /Users/seth/bro.git9/build/src/strings.bif.bro
1 /Users/seth/bro.git9/build/src/bro.bif.bro
1 /Users/seth/bro.git9/build/src/reporter.bif.bro
1 /Users/seth/bro.git9/build/src/event.bif.bro
1 /Users/seth/bro.git9/policy/utils/site.bro
2 /Users/seth/bro.git9/policy/utils/pattern.bro
1 /Users/seth/bro.git9/policy/frameworks/logging/__load__.bro
2 /Users/seth/bro.git9/policy/frameworks/logging/base.bro
3 /Users/seth/bro.git9/build/src/logging.bif.bro
2 /Users/seth/bro.git9/policy/frameworks/logging/plugins/ascii.bro
1 /Users/seth/bro.git9/policy/frameworks/packet-filter/__load__.bro
2 /Users/seth/bro.git9/policy/frameworks/packet-filter/base.bro
3 /Users/seth/bro.git9/policy/frameworks/notice/__load__.bro
4 /Users/seth/bro.git9/policy/frameworks/notice/base.bro
4 /Users/seth/bro.git9/policy/frameworks/notice/weird.bro
5 /Users/seth/bro.git9/policy/utils/conn-ids.bro
2 /Users/seth/bro.git9/policy/frameworks/packet-filter/netstats.bro
0 /Users/seth/bro.git9/testing/btest/.tmp/core.load-unload/load-unload.bro
1 ./dontloadmebro.bro
0 /Users/seth/bro.git9/policy/misc/loaded-scripts.bro

7
testing/btest/core/load-unload.bro
View file

@ -1,8 +1,11 @@
# This tests the @unload directive # This tests the @unload directive
# #
# @TEST-EXEC: echo 'print "oops12345";' >dontloadmebro.bro
# @TEST-EXEC: bro %INPUT misc/loaded-scripts dontloadmebro > output # @TEST-EXEC: bro %INPUT misc/loaded-scripts dontloadmebro > output
# @TEST-EXEC: btest-diff output # @TEST-EXEC: btest-diff output
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff loaded_scripts.log # @TEST-EXEC: grep -q dontloadmebro loaded_scripts.log && exit 1 || exit 0
@unload dontloadmebro @unload dontloadmebro
@TEST-START-FILE dontloadmebro.bro
print "FAIL";
@TEST-END-FILE