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

Merge remote branch 'origin/topic/robin/reporting'

Browse source 
* origin/topic/robin/reporting:
  Syslog BiF now goes through the reporter as well.
  Avoiding infinite loops when an error message handlers triggers errors itself.
  Renaming the Logger to Reporter.
  Overhauling the internal reporting of messages to the user.

Updating a bunch of tests/baselines as well.

Conflicts:
	aux/broccoli
	policy.old/alarm.bro
	policy/all.bro
	policy/bro.init
	policy/frameworks/notice/weird.bro
	policy/notice.bro
	src/SSL-binpac.cc
	src/bro.bif
	src/main.cc
This commit is contained in:
Robin Sommer 2011-07-01 13:44:28 -07:00
commit 9709b1d522
152 changed files with 2625 additions and 1134 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Func.cc
View file

@ -48,6 +48,7 @@
#include "RemoteSerializer.h"
#include "Event.h"
#include "Traverse.h"
#include "Reporter.h"
extern RETSIGTYPE sig_handler(int signo);
@ -333,7 +334,7 @@ Val* BroFunc::Call(val_list* args, Frame* parent) const
(flow != FLOW_RETURN /* we fell off the end */ ||
! result /* explicit return with no result */) &&
! f->HasDelayed() )
warn("non-void function returns without a value:", id->Name());
reporter->Warning("non-void function returns without a value:", id->Name());
if ( result && g_trace_state.DoTrace() )
{
@ -425,9 +426,9 @@ BuiltinFunc::BuiltinFunc(built_in_func arg_func, const char* arg_name,
id = lookup_ID(name, GLOBAL_MODULE_NAME, false);
if ( ! id )
internal_error("built-in function %s missing", name);
reporter->InternalError("built-in function %s missing", name);
if ( id->HasVal() )
internal_error("built-in function %s multiply defined", name);
reporter->InternalError("built-in function %s multiply defined", name);
id->SetVal(new Val(this));
}
@ -499,20 +500,22 @@ bool BuiltinFunc::DoUnserialize(UnserialInfo* info)
return UNSERIALIZE_STR(&name, 0);
}
void builtin_run_time(const char* msg, BroObj* arg)
void builtin_error(const char* msg, BroObj* arg)
{
if ( calling_expr )
calling_expr->RunTime(msg, arg);
calling_expr->Error(msg, arg);
else
run_time(msg, arg);
reporter->Error(msg, arg);
}
#include "bro.bif.func_h"
#include "logging.bif.func_h"
#include "reporter.bif.func_h"
#include "strings.bif.func_h"
#include "bro.bif.func_def"
#include "logging.bif.func_def"
#include "reporter.bif.func_def"
#include "strings.bif.func_def"
void init_builtin_funcs()
@ -526,6 +529,7 @@ void init_builtin_funcs()
#include "bro.bif.func_init"
#include "logging.bif.func_init"
#include "reporter.bif.func_init"
#include "strings.bif.func_init"
did_builtin_init = true;