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

GH-406: rename bro.bif to zeek.bif

Browse source 
Fixes GH-406
This commit is contained in:
Jon Siwek 2019-06-14 19:51:28 -07:00
parent 56bb28a636
commit 853a796b9e
12 changed files with 27 additions and 2312 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.6-413 | 2019-06-14 19:51:28 -0700
* GH-406: rename bro.bif to zeek.bif (Jon Siwek, Corelight)
2.6-412 | 2019-06-14 19:26:21 -0700
* GH-387: update Broker topic names to use "zeek/" prefix (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
2.6-412
2.6-413

2
doc

@ -1 +1 @@
Subproject commit abca6eabff514dfdd02c4312fa8f8c1e3d658bfe
Subproject commit f77e0400ff0057c8461a1dd0658b83de186e6a6b

2
scripts/base/init-bare.zeek
View file

@ -1789,7 +1789,7 @@ type gtp_delete_pdp_ctx_response_elements: record {
};
# Prototypes of Zeek built-in functions.
@load base/bif/bro.bif
@load base/bif/zeek.bif
@load base/bif/stats.bif
@load base/bif/reporter.bif
@load base/bif/strings.bif

2
src/BroString.cc
View file

@ -288,7 +288,7 @@ void BroString::ToUpper()
BroString* BroString::GetSubstring(int start, int len) const
{
// This code used to live in bro.bif's sub_bytes() routine.
// This code used to live in zeek.bif's sub_bytes() routine.
if ( start < 0 || start > n )
return 0;

2
src/CMakeLists.txt
View file

@ -103,7 +103,7 @@ set_property(SOURCE scan.cc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-sign-comp
include(BifCl)
set(BIF_SRCS
bro.bif
zeek.bif
stats.bif
event.bif
const.bif

6
src/Func.cc
View file

@ -761,13 +761,13 @@ void builtin_error(const char* msg, BroObj* arg)
emit(last_call.call);
}
#include "bro.bif.func_h"
#include "zeek.bif.func_h"
#include "stats.bif.func_h"
#include "reporter.bif.func_h"
#include "strings.bif.func_h"
#include "option.bif.func_h"
#include "bro.bif.func_def"
#include "zeek.bif.func_def"
#include "stats.bif.func_def"
#include "reporter.bif.func_def"
#include "strings.bif.func_def"
@ -794,7 +794,7 @@ void init_builtin_funcs()
var_sizes = internal_type("var_sizes")->AsTableType();
#include "bro.bif.func_init"
#include "zeek.bif.func_init"
#include "stats.bif.func_init"
#include "reporter.bif.func_init"
#include "strings.bif.func_init"

0
src/bro.bif → src/zeek.bif
View file

2289
testing/btest/Baseline/core.plugins.hooks/output
View file

File diff suppressed because one or more lines are too long

2
testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
View file

@ -9,7 +9,7 @@
scripts/base/init-bare.zeek
build/scripts/base/bif/const.bif.zeek
build/scripts/base/bif/types.bif.zeek
build/scripts/base/bif/bro.bif.zeek
build/scripts/base/bif/zeek.bif.zeek
build/scripts/base/bif/stats.bif.zeek
build/scripts/base/bif/reporter.bif.zeek
build/scripts/base/bif/strings.bif.zeek

2
testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
View file

@ -9,7 +9,7 @@
scripts/base/init-bare.zeek
build/scripts/base/bif/const.bif.zeek
build/scripts/base/bif/types.bif.zeek
build/scripts/base/bif/bro.bif.zeek
build/scripts/base/bif/zeek.bif.zeek
build/scripts/base/bif/stats.bif.zeek
build/scripts/base/bif/reporter.bif.zeek
build/scripts/base/bif/strings.bif.zeek

26
testing/btest/Baseline/plugins.hooks/output
View file

@ -273,7 +273,7 @@
0.000000 MetaHookPost CallFunction(Log::__create_stream, <frame>, (Weird::LOG, [columns=Weird::Info, ev=Weird::log_weird, path=weird])) -> <no result>
0.000000 MetaHookPost CallFunction(Log::__create_stream, <frame>, (X509::LOG, [columns=X509::Info, ev=X509::log_x509, path=x509])) -> <no result>
0.000000 MetaHookPost CallFunction(Log::__create_stream, <frame>, (mysql::LOG, [columns=MySQL::Info, ev=MySQL::log_mysql, path=mysql])) -> <no result>
0.000000 MetaHookPost CallFunction(Log::__write, <frame>, (PacketFilter::LOG, [ts=1560564690.769635, node=zeek, filter=ip or not ip, init=T, success=T])) -> <no result>
0.000000 MetaHookPost CallFunction(Log::__write, <frame>, (PacketFilter::LOG, [ts=1560566824.729868, node=zeek, filter=ip or not ip, init=T, success=T])) -> <no result>
0.000000 MetaHookPost CallFunction(Log::add_default_filter, <frame>, (Broker::LOG)) -> <no result>
0.000000 MetaHookPost CallFunction(Log::add_default_filter, <frame>, (Cluster::LOG)) -> <no result>
0.000000 MetaHookPost CallFunction(Log::add_default_filter, <frame>, (Config::LOG)) -> <no result>
@ -450,7 +450,7 @@
0.000000 MetaHookPost CallFunction(Log::create_stream, <frame>, (Weird::LOG, [columns=Weird::Info, ev=Weird::log_weird, path=weird])) -> <no result>
0.000000 MetaHookPost CallFunction(Log::create_stream, <frame>, (X509::LOG, [columns=X509::Info, ev=X509::log_x509, path=x509])) -> <no result>
0.000000 MetaHookPost CallFunction(Log::create_stream, <frame>, (mysql::LOG, [columns=MySQL::Info, ev=MySQL::log_mysql, path=mysql])) -> <no result>
0.000000 MetaHookPost CallFunction(Log::write, <frame>, (PacketFilter::LOG, [ts=1560564690.769635, node=zeek, filter=ip or not ip, init=T, success=T])) -> <no result>
0.000000 MetaHookPost CallFunction(Log::write, <frame>, (PacketFilter::LOG, [ts=1560566824.729868, node=zeek, filter=ip or not ip, init=T, success=T])) -> <no result>
0.000000 MetaHookPost CallFunction(NetControl::check_plugins, <frame>, ()) -> <no result>
0.000000 MetaHookPost CallFunction(NetControl::init, <null>, ()) -> <no result>
0.000000 MetaHookPost CallFunction(Notice::want_pp, <frame>, ()) -> <no result>
@ -690,7 +690,6 @@
0.000000 MetaHookPost LoadFile(0, .<...>/benchmark.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, .<...>/binary.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, .<...>/bloom-filter.bif.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, .<...>/bro.bif.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, .<...>/broker.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, .<...>/cardinality-counter.bif.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, .<...>/comm.bif.zeek) -> -1
@ -769,6 +768,7 @@
0.000000 MetaHookPost LoadFile(0, .<...>/utils.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, .<...>/variance.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, .<...>/weird.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, .<...>/zeek.bif.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, .<...>/zeekygen.bif.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, <...>/__load__.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, <...>/__preload__.zeek) -> -1
@ -780,7 +780,6 @@
0.000000 MetaHookPost LoadFile(0, base<...>/analyzer) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/analyzer.bif.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/bif) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/bro.bif.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/broker) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/cluster) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/comm.bif.zeek) -> -1
@ -870,6 +869,7 @@
0.000000 MetaHookPost LoadFile(0, base<...>/weird.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/x509) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/xmpp) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/zeek.bif.zeek) -> -1
0.000000 MetaHookPost LoadFile(1, .<...>/archive.sig) -> -1
0.000000 MetaHookPost LoadFile(1, .<...>/audio.sig) -> -1
0.000000 MetaHookPost LoadFile(1, .<...>/dpd.sig) -> -1
@ -1159,7 +1159,7 @@
0.000000 MetaHookPre CallFunction(Log::__create_stream, <frame>, (Weird::LOG, [columns=Weird::Info, ev=Weird::log_weird, path=weird]))
0.000000 MetaHookPre CallFunction(Log::__create_stream, <frame>, (X509::LOG, [columns=X509::Info, ev=X509::log_x509, path=x509]))
0.000000 MetaHookPre CallFunction(Log::__create_stream, <frame>, (mysql::LOG, [columns=MySQL::Info, ev=MySQL::log_mysql, path=mysql]))
0.000000 MetaHookPre CallFunction(Log::__write, <frame>, (PacketFilter::LOG, [ts=1560564690.769635, node=zeek, filter=ip or not ip, init=T, success=T]))
0.000000 MetaHookPre CallFunction(Log::__write, <frame>, (PacketFilter::LOG, [ts=1560566824.729868, node=zeek, filter=ip or not ip, init=T, success=T]))
0.000000 MetaHookPre CallFunction(Log::add_default_filter, <frame>, (Broker::LOG))
0.000000 MetaHookPre CallFunction(Log::add_default_filter, <frame>, (Cluster::LOG))
0.000000 MetaHookPre CallFunction(Log::add_default_filter, <frame>, (Config::LOG))
@ -1336,7 +1336,7 @@
0.000000 MetaHookPre CallFunction(Log::create_stream, <frame>, (Weird::LOG, [columns=Weird::Info, ev=Weird::log_weird, path=weird]))
0.000000 MetaHookPre CallFunction(Log::create_stream, <frame>, (X509::LOG, [columns=X509::Info, ev=X509::log_x509, path=x509]))
0.000000 MetaHookPre CallFunction(Log::create_stream, <frame>, (mysql::LOG, [columns=MySQL::Info, ev=MySQL::log_mysql, path=mysql]))
0.000000 MetaHookPre CallFunction(Log::write, <frame>, (PacketFilter::LOG, [ts=1560564690.769635, node=zeek, filter=ip or not ip, init=T, success=T]))
0.000000 MetaHookPre CallFunction(Log::write, <frame>, (PacketFilter::LOG, [ts=1560566824.729868, node=zeek, filter=ip or not ip, init=T, success=T]))
0.000000 MetaHookPre CallFunction(NetControl::check_plugins, <frame>, ())
0.000000 MetaHookPre CallFunction(NetControl::init, <null>, ())
0.000000 MetaHookPre CallFunction(Notice::want_pp, <frame>, ())
@ -1576,7 +1576,6 @@
0.000000 MetaHookPre LoadFile(0, .<...>/benchmark.zeek)
0.000000 MetaHookPre LoadFile(0, .<...>/binary.zeek)
0.000000 MetaHookPre LoadFile(0, .<...>/bloom-filter.bif.zeek)
0.000000 MetaHookPre LoadFile(0, .<...>/bro.bif.zeek)
0.000000 MetaHookPre LoadFile(0, .<...>/broker.zeek)
0.000000 MetaHookPre LoadFile(0, .<...>/cardinality-counter.bif.zeek)
0.000000 MetaHookPre LoadFile(0, .<...>/comm.bif.zeek)
@ -1655,6 +1654,7 @@
0.000000 MetaHookPre LoadFile(0, .<...>/utils.zeek)
0.000000 MetaHookPre LoadFile(0, .<...>/variance.zeek)
0.000000 MetaHookPre LoadFile(0, .<...>/weird.zeek)
0.000000 MetaHookPre LoadFile(0, .<...>/zeek.bif.zeek)
0.000000 MetaHookPre LoadFile(0, .<...>/zeekygen.bif.zeek)
0.000000 MetaHookPre LoadFile(0, <...>/__load__.zeek)
0.000000 MetaHookPre LoadFile(0, <...>/__preload__.zeek)
@ -1666,7 +1666,6 @@
0.000000 MetaHookPre LoadFile(0, base<...>/analyzer)
0.000000 MetaHookPre LoadFile(0, base<...>/analyzer.bif.zeek)
0.000000 MetaHookPre LoadFile(0, base<...>/bif)
0.000000 MetaHookPre LoadFile(0, base<...>/bro.bif.zeek)
0.000000 MetaHookPre LoadFile(0, base<...>/broker)
0.000000 MetaHookPre LoadFile(0, base<...>/cluster)
0.000000 MetaHookPre LoadFile(0, base<...>/comm.bif.zeek)
@ -1756,6 +1755,7 @@
0.000000 MetaHookPre LoadFile(0, base<...>/weird.zeek)
0.000000 MetaHookPre LoadFile(0, base<...>/x509)
0.000000 MetaHookPre LoadFile(0, base<...>/xmpp)
0.000000 MetaHookPre LoadFile(0, base<...>/zeek.bif.zeek)
0.000000 MetaHookPre LoadFile(1, .<...>/archive.sig)
0.000000 MetaHookPre LoadFile(1, .<...>/audio.sig)
0.000000 MetaHookPre LoadFile(1, .<...>/dpd.sig)
@ -2044,7 +2044,7 @@
0.000000 | HookCallFunction Log::__create_stream(Weird::LOG, [columns=Weird::Info, ev=Weird::log_weird, path=weird])
0.000000 | HookCallFunction Log::__create_stream(X509::LOG, [columns=X509::Info, ev=X509::log_x509, path=x509])
0.000000 | HookCallFunction Log::__create_stream(mysql::LOG, [columns=MySQL::Info, ev=MySQL::log_mysql, path=mysql])
0.000000 | HookCallFunction Log::__write(PacketFilter::LOG, [ts=1560564690.769635, node=zeek, filter=ip or not ip, init=T, success=T])
0.000000 | HookCallFunction Log::__write(PacketFilter::LOG, [ts=1560566824.729868, node=zeek, filter=ip or not ip, init=T, success=T])
0.000000 | HookCallFunction Log::add_default_filter(Broker::LOG)
0.000000 | HookCallFunction Log::add_default_filter(Cluster::LOG)
0.000000 | HookCallFunction Log::add_default_filter(Config::LOG)
@ -2221,7 +2221,7 @@
0.000000 | HookCallFunction Log::create_stream(Weird::LOG, [columns=Weird::Info, ev=Weird::log_weird, path=weird])
0.000000 | HookCallFunction Log::create_stream(X509::LOG, [columns=X509::Info, ev=X509::log_x509, path=x509])
0.000000 | HookCallFunction Log::create_stream(mysql::LOG, [columns=MySQL::Info, ev=MySQL::log_mysql, path=mysql])
0.000000 | HookCallFunction Log::write(PacketFilter::LOG, [ts=1560564690.769635, node=zeek, filter=ip or not ip, init=T, success=T])
0.000000 | HookCallFunction Log::write(PacketFilter::LOG, [ts=1560566824.729868, node=zeek, filter=ip or not ip, init=T, success=T])
0.000000 | HookCallFunction NetControl::check_plugins()
0.000000 | HookCallFunction NetControl::init()
0.000000 | HookCallFunction Notice::want_pp()
@ -2463,7 +2463,6 @@
0.000000 | HookLoadFile .<...>/benchmark.zeek
0.000000 | HookLoadFile .<...>/binary.zeek
0.000000 | HookLoadFile .<...>/bloom-filter.bif.zeek
0.000000 | HookLoadFile .<...>/bro.bif.zeek
0.000000 | HookLoadFile .<...>/broker.zeek
0.000000 | HookLoadFile .<...>/cardinality-counter.bif.zeek
0.000000 | HookLoadFile .<...>/comm.bif.zeek
@ -2549,6 +2548,7 @@
0.000000 | HookLoadFile .<...>/variance.zeek
0.000000 | HookLoadFile .<...>/video.sig
0.000000 | HookLoadFile .<...>/weird.zeek
0.000000 | HookLoadFile .<...>/zeek.bif.zeek
0.000000 | HookLoadFile .<...>/zeekygen.bif.zeek
0.000000 | HookLoadFile <...>/__load__.zeek
0.000000 | HookLoadFile <...>/__preload__.zeek
@ -2560,7 +2560,6 @@
0.000000 | HookLoadFile base<...>/analyzer
0.000000 | HookLoadFile base<...>/analyzer.bif.zeek
0.000000 | HookLoadFile base<...>/bif
0.000000 | HookLoadFile base<...>/bro.bif.zeek
0.000000 | HookLoadFile base<...>/broker
0.000000 | HookLoadFile base<...>/cluster
0.000000 | HookLoadFile base<...>/comm.bif.zeek
@ -2650,8 +2649,9 @@
0.000000 | HookLoadFile base<...>/weird.zeek
0.000000 | HookLoadFile base<...>/x509
0.000000 | HookLoadFile base<...>/xmpp
0.000000 | HookLoadFile base<...>/zeek.bif.zeek
0.000000 | HookLogInit packet_filter 1/1 {ts (time), node (string), filter (string), init (bool), success (bool)}
0.000000 | HookLogWrite packet_filter [ts=1560564690.769635, node=zeek, filter=ip or not ip, init=T, success=T]
0.000000 | HookLogWrite packet_filter [ts=1560566824.729868, node=zeek, filter=ip or not ip, init=T, success=T]
0.000000 | HookQueueEvent NetControl::init()
0.000000 | HookQueueEvent filter_change_tracking()
0.000000 | HookQueueEvent zeek_init()