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

Merge remote-tracking branch 'origin/topic/jsiwek/reporter-fatal-bif'

Browse source 
* origin/topic/jsiwek/reporter-fatal-bif:
  Add a Reporter::fatal BIF.
This commit is contained in:
Seth Hall 2011-09-01 10:52:39 -04:00
commit 1726aee4e9
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/base/frameworks/notice/main.bro
View file

@ -393,10 +393,7 @@ event bro_init() &priority=10
for ( pi in policy ) for ( pi in policy )
{ {
if ( pi$priority < 0 || pi$priority > 10 ) if ( pi$priority < 0 || pi$priority > 10 )
{ Reporter::fatal("All Notice::PolicyItem priorities must be within 0 and 10");
print "All Notice::PolicyItem priorities must be within 0 and 10";
exit();
}
if ( pi$priority !in tmp ) if ( pi$priority !in tmp )
tmp[pi$priority] = set(); tmp[pi$priority] = set();

2
scripts/base/frameworks/packet-filter/main.bro
View file

@ -121,7 +121,7 @@ function install()
NOTICE([$note=Compile_Failure, NOTICE([$note=Compile_Failure,
$msg=fmt("Compiling packet filter failed"), $msg=fmt("Compiling packet filter failed"),
$sub=default_filter]); $sub=default_filter]);
exit(); Reporter::fatal(fmt("Bad pcap filter '%s'", default_filter));
} }
# Do an audit log for the packet filter. # Do an audit log for the packet filter.

8
src/reporter.bif
View file

@ -28,3 +28,11 @@ function Reporter::error%(msg: string%): bool
reporter->PopLocation(); reporter->PopLocation();
return new Val(1, TYPE_BOOL); return new Val(1, TYPE_BOOL);
%} %}
function Reporter::fatal%(msg: string%): bool
%{
reporter->PushLocation(frame->GetCall()->GetLocationInfo());
reporter->FatalError("%s", msg->CheckString());
reporter->PopLocation();
return new Val(1, TYPE_BOOL);
%}

2
testing/btest/scripts/base/frameworks/packet-filter/bad-filter.test Normal file
View file

@ -0,0 +1,2 @@
# @TEST-EXEC-FAIL: bro -r $TRACES/web.trace -f "bad filter"
# @TEST-EXEC: test -s .stderr