From cffecc503336771412aa461591271aa8b63de0b2 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 20 Jul 2020 14:44:57 -0700 Subject: [PATCH] bifcl: Move event code to zeek namespace, rename mgr to event_mgr --- tools/bifcl/builtin-func.y | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/bifcl/builtin-func.y b/tools/bifcl/builtin-func.y index 3912ec569c..688bd810c1 100644 --- a/tools/bifcl/builtin-func.y +++ b/tools/bifcl/builtin-func.y @@ -266,7 +266,7 @@ static void print_event_c_body(FILE* fp, bool smart) BuiltinFuncArg* connection_arg = 0; - fprintf(fp, "\tmgr.Enqueue(%s, zeek::Args{\n", decl.c_fullname.c_str()); + fprintf(fp, "\tzeek::event_mgr.Enqueue(%s, zeek::Args{\n", decl.c_fullname.c_str()); for ( int i = 0; i < (int) args.size(); ++i ) { @@ -655,12 +655,12 @@ head_1: TOK_ID opt_ws arg_begin { // TODO: add namespace for events here fprintf(fp_netvar_h, - "%sextern EventHandlerPtr %s; %s\n", + "%sextern zeek::EventHandlerPtr %s; %s\n", decl.c_namespace_start.c_str(), decl.bare_name.c_str(), decl.c_namespace_end.c_str()); fprintf(fp_netvar_def, - "%sEventHandlerPtr %s; %s\n", - decl.c_namespace_start.c_str(), decl.bare_name.c_str(), decl.c_namespace_end.c_str()); + "%szeek::EventHandlerPtr %s; %s\n", + decl.c_namespace_start.c_str(), decl.bare_name.c_str(), decl.c_namespace_end.c_str()); fprintf(fp_netvar_init, "\t%s = event_registry->Register(\"%s\");\n",