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

Merge remote branch 'origin/master' into topic/robin/logging-internals

Browse source 
Conflicts:
	policy/bro.init
	src/builtin-func.l
This commit is contained in:
Robin Sommer 2011-02-25 16:11:03 -08:00
commit e3b2748fa6
63 changed files with 952 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Func.cc
View file

@ -507,6 +507,17 @@ void builtin_run_time(const char* msg, BroObj* arg)
run_time(msg, arg);
}
#include "bro.bif.func_h"
#include "common-rw.bif.func_h"
#include "finger-rw.bif.func_h"
#include "ftp-rw.bif.func_h"
#include "http-rw.bif.func_h"
#include "ident-rw.bif.func_h"
#include "smtp-rw.bif.func_h"
#include "strings.bif.func_h"
#include "dns-rw.bif.func_h"
#include "bro.bif.func_def"
#include "strings.bif.func_def"
@ -534,7 +545,7 @@ void init_builtin_funcs()
bool check_built_in_call(BuiltinFunc* f, CallExpr* call)
{
if ( f->TheFunc() != bro_fmt )
if ( f->TheFunc() != BifFunc::bro_fmt )
return true;
const expr_list& args = call->Args()->Exprs();