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

Rename broker-related namespaces.

Browse source 
c++ namespace "comm" -> bro_broker
script module "Comm" -> BrokerComm
script module "Store" -> BrokerStore
This commit is contained in:
Jon Siwek 2015-03-05 16:20:51 -06:00
parent 25a4d0ebed
commit fa08083a92
65 changed files with 1142 additions and 1142 deletions
Download patch file Download diff file Expand all files Collapse all files

10
testing/btest/Baseline/comm.clone_store/clone.clone.out
View file

@ -1,5 +1,5 @@
clone keys, [status=Store::SUCCESS, result=[d=broker::data{[one, two, myset, myvec]}]]
lookup, one, [status=Store::SUCCESS, result=[d=broker::data{111}]]
lookup, two, [status=Store::SUCCESS, result=[d=broker::data{222}]]
lookup, myset, [status=Store::SUCCESS, result=[d=broker::data{{a, c, d}}]]
lookup, myvec, [status=Store::SUCCESS, result=[d=broker::data{[delta, alpha, beta, gamma, omega]}]]
clone keys, [status=BrokerStore::SUCCESS, result=[d=broker::data{[one, two, myset, myvec]}]]
lookup, one, [status=BrokerStore::SUCCESS, result=[d=broker::data{111}]]
lookup, two, [status=BrokerStore::SUCCESS, result=[d=broker::data{222}]]
lookup, myset, [status=BrokerStore::SUCCESS, result=[d=broker::data{{a, c, d}}]]
lookup, myvec, [status=BrokerStore::SUCCESS, result=[d=broker::data{[delta, alpha, beta, gamma, omega]}]]

4
testing/btest/Baseline/comm.connection_updates/recv.recv.out
View file

@ -1,2 +1,2 @@
Comm::incoming_connection_established, connector
Comm::incoming_connection_broken, connector
BrokerComm::incoming_connection_established, connector
BrokerComm::incoming_connection_broken, connector

2
testing/btest/Baseline/comm.connection_updates/send.send.out
View file

@ -1 +1 @@
Comm::outgoing_connection_established, 127.0.0.1, 9999/tcp, listener
BrokerComm::outgoing_connection_established, 127.0.0.1, 9999/tcp, listener

32
testing/btest/Baseline/comm.data/out
View file

@ -1,18 +1,18 @@
Comm::BOOL
Comm::INT
Comm::COUNT
Comm::DOUBLE
Comm::STRING
Comm::ADDR
Comm::SUBNET
Comm::PORT
Comm::TIME
Comm::INTERVAL
Comm::ENUM
Comm::SET
Comm::TABLE
Comm::VECTOR
Comm::RECORD
BrokerComm::BOOL
BrokerComm::INT
BrokerComm::COUNT
BrokerComm::DOUBLE
BrokerComm::STRING
BrokerComm::ADDR
BrokerComm::SUBNET
BrokerComm::PORT
BrokerComm::TIME
BrokerComm::INTERVAL
BrokerComm::ENUM
BrokerComm::SET
BrokerComm::TABLE
BrokerComm::VECTOR
BrokerComm::RECORD
***************************
T
F
@ -29,7 +29,7 @@ hello
22/tcp
42.0
180.0
Comm::BOOL
BrokerComm::BOOL
***************************
{
two,

28
testing/btest/Baseline/comm.master_store/master.out
View file

@ -1,14 +1,14 @@
lookup(two): [status=Store::SUCCESS, result=[d=broker::data{222}]]
lookup(four): [status=Store::SUCCESS, result=[d=<uninitialized>]]
lookup(myset): [status=Store::SUCCESS, result=[d=broker::data{{a, c, d}}]]
lookup(one): [status=Store::SUCCESS, result=[d=broker::data{111}]]
lookup(myvec): [status=Store::SUCCESS, result=[d=broker::data{[delta, alpha, beta, gamma, omega]}]]
exists(one): [status=Store::SUCCESS, result=[d=broker::data{1}]]
exists(two): [status=Store::SUCCESS, result=[d=broker::data{0}]]
exists(myset): [status=Store::SUCCESS, result=[d=broker::data{1}]]
exists(four): [status=Store::SUCCESS, result=[d=broker::data{0}]]
pop_right(myvec): [status=Store::SUCCESS, result=[d=broker::data{omega}]]
pop_left(myvec): [status=Store::SUCCESS, result=[d=broker::data{delta}]]
keys: [status=Store::SUCCESS, result=[d=broker::data{[myvec, myset, one]}]]
size: [status=Store::SUCCESS, result=[d=broker::data{3}]]
size (after clear): [status=Store::SUCCESS, result=[d=broker::data{0}]]
lookup(two): [status=BrokerStore::SUCCESS, result=[d=broker::data{222}]]
lookup(four): [status=BrokerStore::SUCCESS, result=[d=<uninitialized>]]
lookup(myset): [status=BrokerStore::SUCCESS, result=[d=broker::data{{a, c, d}}]]
lookup(one): [status=BrokerStore::SUCCESS, result=[d=broker::data{111}]]
lookup(myvec): [status=BrokerStore::SUCCESS, result=[d=broker::data{[delta, alpha, beta, gamma, omega]}]]
exists(one): [status=BrokerStore::SUCCESS, result=[d=broker::data{1}]]
exists(two): [status=BrokerStore::SUCCESS, result=[d=broker::data{0}]]
exists(myset): [status=BrokerStore::SUCCESS, result=[d=broker::data{1}]]
exists(four): [status=BrokerStore::SUCCESS, result=[d=broker::data{0}]]
pop_right(myvec): [status=BrokerStore::SUCCESS, result=[d=broker::data{omega}]]
pop_left(myvec): [status=BrokerStore::SUCCESS, result=[d=broker::data{delta}]]
keys: [status=BrokerStore::SUCCESS, result=[d=broker::data{[myvec, myset, one]}]]
size: [status=BrokerStore::SUCCESS, result=[d=broker::data{3}]]
size (after clear): [status=BrokerStore::SUCCESS, result=[d=broker::data{0}]]

2
testing/btest/Baseline/comm.remote_event/send.send.out
View file

@ -1,4 +1,4 @@
Comm::outgoing_connection_established, 127.0.0.1, 9999/tcp
BrokerComm::outgoing_connection_established, 127.0.0.1, 9999/tcp
got event msg, pong, 0
got auto event msg, ping, 0
got event msg, pong, 1

2
testing/btest/Baseline/comm.remote_log/send.send.out
View file

@ -1 +1 @@
Comm::outgoing_connection_established, 127.0.0.1, 9999/tcp
BrokerComm::outgoing_connection_established, 127.0.0.1, 9999/tcp

2
testing/btest/Baseline/comm.remote_print/send.send.out
View file

@ -1,4 +1,4 @@
Comm::outgoing_connection_established, 127.0.0.1, 9999/tcp
BrokerComm::outgoing_connection_established, 127.0.0.1, 9999/tcp
got print msg, pong 0
got print msg, pong 1
got print msg, pong 2

10
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_connecting-connector_bro/output
View file

@ -5,19 +5,19 @@ connecting-connector.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "connector";
redef BrokerComm::endpoint_name = "connector";
event bro_init()
{
Comm::enable();
Comm::connect("127.0.0.1", broker_port, 1sec);
BrokerComm::enable();
BrokerComm::connect("127.0.0.1", broker_port, 1sec);
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established",
print "BrokerComm::outgoing_connection_established",
peer_address, peer_port, peer_name;
terminate();
}

14
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_connecting-listener_bro/output
View file

@ -5,21 +5,21 @@ connecting-listener.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "listener";
redef BrokerComm::endpoint_name = "listener";
event bro_init()
{
Comm::enable();
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::listen(broker_port, "127.0.0.1");
}
event Comm::incoming_connection_established(peer_name: string)
event BrokerComm::incoming_connection_established(peer_name: string)
{
print "Comm::incoming_connection_established", peer_name;
print "BrokerComm::incoming_connection_established", peer_name;
}
event Comm::incoming_connection_broken(peer_name: string)
event BrokerComm::incoming_connection_broken(peer_name: string)
{
print "Comm::incoming_connection_broken", peer_name;
print "BrokerComm::incoming_connection_broken", peer_name;
terminate();
}

20
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_events-connector_bro/output
View file

@ -4,31 +4,31 @@ events-connector.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "connector";
redef BrokerComm::endpoint_name = "connector";
global my_event: event(msg: string, c: count);
global my_auto_event: event(msg: string, c: count);
event bro_init()
{
Comm::enable();
Comm::connect("127.0.0.1", broker_port, 1sec);
Comm::auto_event("bro/event/my_auto_event", my_auto_event);
BrokerComm::enable();
BrokerComm::connect("127.0.0.1", broker_port, 1sec);
BrokerComm::auto_event("bro/event/my_auto_event", my_auto_event);
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established",
print "BrokerComm::outgoing_connection_established",
peer_address, peer_port, peer_name;
Comm::event("bro/event/my_event", Comm::event_args(my_event, "hi", 0));
BrokerComm::event("bro/event/my_event", BrokerComm::event_args(my_event, "hi", 0));
event my_auto_event("stuff", 88);
Comm::event("bro/event/my_event", Comm::event_args(my_event, "...", 1));
BrokerComm::event("bro/event/my_event", BrokerComm::event_args(my_event, "...", 1));
event my_auto_event("more stuff", 51);
Comm::event("bro/event/my_event", Comm::event_args(my_event, "bye", 2));
BrokerComm::event("bro/event/my_event", BrokerComm::event_args(my_event, "bye", 2));
}
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();

12
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_events-listener_bro/output
View file

@ -5,21 +5,21 @@ events-listener.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "listener";
redef BrokerComm::endpoint_name = "listener";
global msg_count = 0;
global my_event: event(msg: string, c: count);
global my_auto_event: event(msg: string, c: count);
event bro_init()
{
Comm::enable();
Comm::subscribe_to_events("bro/event/");
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::subscribe_to_events("bro/event/");
BrokerComm::listen(broker_port, "127.0.0.1");
}
event Comm::incoming_connection_established(peer_name: string)
event BrokerComm::incoming_connection_established(peer_name: string)
{
print "Comm::incoming_connection_established", peer_name;
print "BrokerComm::incoming_connection_established", peer_name;
}
event my_event(msg: string, c: count)

14
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_logs-connector_bro/output
View file

@ -6,16 +6,16 @@ logs-connector.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "connector";
redef BrokerComm::endpoint_name = "connector";
redef Log::enable_local_logging = F;
redef Log::enable_remote_logging = F;
global n = 0;
event bro_init()
{
Comm::enable();
Comm::enable_remote_logs(Test::LOG);
Comm::connect("127.0.0.1", broker_port, 1sec);
BrokerComm::enable();
BrokerComm::enable_remote_logs(Test::LOG);
BrokerComm::connect("127.0.0.1", broker_port, 1sec);
}
event do_write()
@ -28,16 +28,16 @@ event do_write()
event do_write();
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established",
print "BrokerComm::outgoing_connection_established",
peer_address, peer_port, peer_name;
event do_write();
}
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();

12
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_logs-listener_bro/output
View file

@ -6,18 +6,18 @@ logs-listener.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "listener";
redef BrokerComm::endpoint_name = "listener";
event bro_init()
{
Comm::enable();
Comm::subscribe_to_logs("bro/log/Test::LOG");
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::subscribe_to_logs("bro/log/Test::LOG");
BrokerComm::listen(broker_port, "127.0.0.1");
}
event Comm::incoming_connection_established(peer_name: string)
event BrokerComm::incoming_connection_established(peer_name: string)
{
print "Comm::incoming_connection_established", peer_name;
print "BrokerComm::incoming_connection_established", peer_name;
}
event Test::log_test(rec: Test::Info)

18
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_printing-connector_bro/output
View file

@ -4,26 +4,26 @@ printing-connector.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "connector";
redef BrokerComm::endpoint_name = "connector";
event bro_init()
{
Comm::enable();
Comm::connect("127.0.0.1", broker_port, 1sec);
BrokerComm::enable();
BrokerComm::connect("127.0.0.1", broker_port, 1sec);
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established",
print "BrokerComm::outgoing_connection_established",
peer_address, peer_port, peer_name;
Comm::print("bro/print/hi", "hello");
Comm::print("bro/print/stuff", "...");
Comm::print("bro/print/bye", "goodbye");
BrokerComm::print("bro/print/hi", "hello");
BrokerComm::print("bro/print/stuff", "...");
BrokerComm::print("bro/print/bye", "goodbye");
}
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();

14
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_printing-listener_bro/output
View file

@ -5,22 +5,22 @@ printing-listener.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "listener";
redef BrokerComm::endpoint_name = "listener";
global msg_count = 0;
event bro_init()
{
Comm::enable();
Comm::subscribe_to_prints("bro/print/");
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::subscribe_to_prints("bro/print/");
BrokerComm::listen(broker_port, "127.0.0.1");
}
event Comm::incoming_connection_established(peer_name: string)
event BrokerComm::incoming_connection_established(peer_name: string)
{
print "Comm::incoming_connection_established", peer_name;
print "BrokerComm::incoming_connection_established", peer_name;
}
event Comm::print_handler(msg: string)
event BrokerComm::print_handler(msg: string)
{
++msg_count;
print "got print message", msg;

40
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_stores-connector_bro/output
View file

@ -5,42 +5,42 @@ stores-connector.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
global h: opaque of Store::Handle;
global h: opaque of BrokerStore::Handle;
function dv(d: Comm::Data): Comm::DataVector
function dv(d: BrokerComm::Data): BrokerComm::DataVector
{
local rval: Comm::DataVector;
local rval: BrokerComm::DataVector;
rval[0] = d;
return rval;
}
global ready: event();
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
local myset: set[string] = {"a", "b", "c"};
local myvec: vector of string = {"alpha", "beta", "gamma"};
h = Store::create_master("mystore");
Store::insert(h, Comm::data("one"), Comm::data(110));
Store::insert(h, Comm::data("two"), Comm::data(223));
Store::insert(h, Comm::data("myset"), Comm::data(myset));
Store::insert(h, Comm::data("myvec"), Comm::data(myvec));
Store::increment(h, Comm::data("one"));
Store::decrement(h, Comm::data("two"));
Store::add_to_set(h, Comm::data("myset"), Comm::data("d"));
Store::remove_from_set(h, Comm::data("myset"), Comm::data("b"));
Store::push_left(h, Comm::data("myvec"), dv(Comm::data("delta")));
Store::push_right(h, Comm::data("myvec"), dv(Comm::data("omega")));
h = BrokerStore::create_master("mystore");
BrokerStore::insert(h, BrokerComm::data("one"), BrokerComm::data(110));
BrokerStore::insert(h, BrokerComm::data("two"), BrokerComm::data(223));
BrokerStore::insert(h, BrokerComm::data("myset"), BrokerComm::data(myset));
BrokerStore::insert(h, BrokerComm::data("myvec"), BrokerComm::data(myvec));
BrokerStore::increment(h, BrokerComm::data("one"));
BrokerStore::decrement(h, BrokerComm::data("two"));
BrokerStore::add_to_set(h, BrokerComm::data("myset"), BrokerComm::data("d"));
BrokerStore::remove_from_set(h, BrokerComm::data("myset"), BrokerComm::data("b"));
BrokerStore::push_left(h, BrokerComm::data("myvec"), dv(BrokerComm::data("delta")));
BrokerStore::push_right(h, BrokerComm::data("myvec"), dv(BrokerComm::data("omega")));
when ( local res = Store::size(h) )
when ( local res = BrokerStore::size(h) )
{
print "master size", res;
event ready();
@ -51,7 +51,7 @@ event Comm::outgoing_connection_established(peer_address: string,
event bro_init()
{
Comm::enable();
Comm::connect("127.0.0.1", broker_port, 1secs);
Comm::auto_event("bro/event/ready", ready);
BrokerComm::enable();
BrokerComm::connect("127.0.0.1", broker_port, 1secs);
BrokerComm::auto_event("bro/event/ready", ready);
}

22
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_stores-listener_bro/output
View file

@ -5,13 +5,13 @@ stores-listener.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
global h: opaque of Store::Handle;
global h: opaque of BrokerStore::Handle;
global expected_key_count = 4;
global key_count = 0;
function do_lookup(key: string)
{
when ( local res = Store::lookup(h, Comm::data(key)) )
when ( local res = BrokerStore::lookup(h, BrokerComm::data(key)) )
{
++key_count;
print "lookup", key, res;
@ -25,15 +25,15 @@ function do_lookup(key: string)
event ready()
{
h = Store::create_clone("mystore");
h = BrokerStore::create_clone("mystore");
when ( local res = Store::keys(h) )
when ( local res = BrokerStore::keys(h) )
{
print "clone keys", res;
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 0)));
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 1)));
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 2)));
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 3)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 0)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 1)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 2)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 3)));
}
timeout 10sec
{ print "timeout"; }
@ -41,7 +41,7 @@ event ready()
event bro_init()
{
Comm::enable();
Comm::subscribe_to_events("bro/event/ready");
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::subscribe_to_events("bro/event/ready");
BrokerComm::listen(broker_port, "127.0.0.1");
}

2
testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_testlog_bro/output
View file

@ -18,6 +18,6 @@ export {
event bro_init() &priority=5
{
Comm::enable();
BrokerComm::enable();
Log::create_stream(Test::LOG, [$columns=Test::Info, $ev=log_test]);
}

62
testing/btest/comm/clone_store.bro
View file

@ -13,7 +13,7 @@
const broker_port: port &redef;
redef exit_only_after_terminate = T;
global h: opaque of Store::Handle;
global h: opaque of BrokerStore::Handle;
global expected_key_count = 4;
global key_count = 0;
@ -21,7 +21,7 @@ global query_timeout = 15sec;
function do_lookup(key: string)
{
when ( local res = Store::lookup(h, Comm::data(key)) )
when ( local res = BrokerStore::lookup(h, BrokerComm::data(key)) )
{
++key_count;
print "lookup", key, res;
@ -38,15 +38,15 @@ function do_lookup(key: string)
event ready()
{
h = Store::create_clone("mystore");
h = BrokerStore::create_clone("mystore");
when ( local res = Store::keys(h) )
when ( local res = BrokerStore::keys(h) )
{
print "clone keys", res;
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 0)));
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 1)));
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 2)));
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 3)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 0)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 1)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 2)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 3)));
}
timeout query_timeout
{
@ -57,9 +57,9 @@ event ready()
event bro_init()
{
Comm::enable();
Comm::subscribe_to_events("bro/event/ready");
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::subscribe_to_events("bro/event/ready");
BrokerComm::listen(broker_port, "127.0.0.1");
}
@TEST-END-FILE
@ -71,42 +71,42 @@ global query_timeout = 15sec;
const broker_port: port &redef;
redef exit_only_after_terminate = T;
global h: opaque of Store::Handle;
global h: opaque of BrokerStore::Handle;
function dv(d: Comm::Data): Comm::DataVector
function dv(d: BrokerComm::Data): BrokerComm::DataVector
{
local rval: Comm::DataVector;
local rval: BrokerComm::DataVector;
rval[0] = d;
return rval;
}
global ready: event();
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
local myset: set[string] = {"a", "b", "c"};
local myvec: vector of string = {"alpha", "beta", "gamma"};
h = Store::create_master("mystore");
Store::insert(h, Comm::data("one"), Comm::data(110));
Store::insert(h, Comm::data("two"), Comm::data(223));
Store::insert(h, Comm::data("myset"), Comm::data(myset));
Store::insert(h, Comm::data("myvec"), Comm::data(myvec));
Store::increment(h, Comm::data("one"));
Store::decrement(h, Comm::data("two"));
Store::add_to_set(h, Comm::data("myset"), Comm::data("d"));
Store::remove_from_set(h, Comm::data("myset"), Comm::data("b"));
Store::push_left(h, Comm::data("myvec"), dv(Comm::data("delta")));
Store::push_right(h, Comm::data("myvec"), dv(Comm::data("omega")));
h = BrokerStore::create_master("mystore");
BrokerStore::insert(h, BrokerComm::data("one"), BrokerComm::data(110));
BrokerStore::insert(h, BrokerComm::data("two"), BrokerComm::data(223));
BrokerStore::insert(h, BrokerComm::data("myset"), BrokerComm::data(myset));
BrokerStore::insert(h, BrokerComm::data("myvec"), BrokerComm::data(myvec));
BrokerStore::increment(h, BrokerComm::data("one"));
BrokerStore::decrement(h, BrokerComm::data("two"));
BrokerStore::add_to_set(h, BrokerComm::data("myset"), BrokerComm::data("d"));
BrokerStore::remove_from_set(h, BrokerComm::data("myset"), BrokerComm::data("b"));
BrokerStore::push_left(h, BrokerComm::data("myvec"), dv(BrokerComm::data("delta")));
BrokerStore::push_right(h, BrokerComm::data("myvec"), dv(BrokerComm::data("omega")));
when ( local res = Store::size(h) )
when ( local res = BrokerStore::size(h) )
{ event ready(); }
timeout query_timeout
{
@ -117,9 +117,9 @@ event Comm::outgoing_connection_established(peer_address: string,
event bro_init()
{
Comm::enable();
Comm::auto_event("bro/event/ready", ready);
Comm::connect("127.0.0.1", broker_port, 1secs);
BrokerComm::enable();
BrokerComm::auto_event("bro/event/ready", ready);
BrokerComm::connect("127.0.0.1", broker_port, 1secs);
}
@TEST-END-FILE

24
testing/btest/comm/connection_updates.bro
View file

@ -12,22 +12,22 @@
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "listener";
redef BrokerComm::endpoint_name = "listener";
event bro_init()
{
Comm::enable();
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::listen(broker_port, "127.0.0.1");
}
event Comm::incoming_connection_established(peer_name: string)
event BrokerComm::incoming_connection_established(peer_name: string)
{
print "Comm::incoming_connection_established", peer_name;;
print "BrokerComm::incoming_connection_established", peer_name;;
}
event Comm::incoming_connection_broken(peer_name: string)
event BrokerComm::incoming_connection_broken(peer_name: string)
{
print "Comm::incoming_connection_broken", peer_name;;
print "BrokerComm::incoming_connection_broken", peer_name;;
terminate();
}
@ -37,19 +37,19 @@ event Comm::incoming_connection_broken(peer_name: string)
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "connector";
redef BrokerComm::endpoint_name = "connector";
event bro_init()
{
Comm::enable();
Comm::connect("127.0.0.1", broker_port, 1sec);
BrokerComm::enable();
BrokerComm::connect("127.0.0.1", broker_port, 1sec);
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established",
print "BrokerComm::outgoing_connection_established",
peer_address, peer_port, peer_name;;
terminate();
}

228
testing/btest/comm/data.bro
View file

@ -13,210 +13,210 @@ type bro_record : record {
c: count;
};
function comm_record_to_bro_record_recurse(it: opaque of Comm::RecordIterator,
function comm_record_to_bro_record_recurse(it: opaque of BrokerComm::RecordIterator,
rval: bro_record,
idx: count): bro_record
{
if ( Comm::record_iterator_last(it) )
if ( BrokerComm::record_iterator_last(it) )
return rval;
local field_value = Comm::record_iterator_value(it);
local field_value = BrokerComm::record_iterator_value(it);
if ( field_value?$d )
switch ( idx ) {
case 0:
rval$a = Comm::refine_to_string(field_value);
rval$a = BrokerComm::refine_to_string(field_value);
break;
case 1:
rval$b = Comm::refine_to_string(field_value);
rval$b = BrokerComm::refine_to_string(field_value);
break;
case 2:
rval$c = Comm::refine_to_count(field_value);
rval$c = BrokerComm::refine_to_count(field_value);
break;
};
++idx;
Comm::record_iterator_next(it);
BrokerComm::record_iterator_next(it);
return comm_record_to_bro_record_recurse(it, rval, idx);
}
function comm_record_to_bro_record(d: Comm::Data): bro_record
function comm_record_to_bro_record(d: BrokerComm::Data): bro_record
{
return comm_record_to_bro_record_recurse(Comm::record_iterator(d),
return comm_record_to_bro_record_recurse(BrokerComm::record_iterator(d),
bro_record($c = 0), 0);
}
function
comm_set_to_bro_set_recurse(it: opaque of Comm::SetIterator,
comm_set_to_bro_set_recurse(it: opaque of BrokerComm::SetIterator,
rval: bro_set): bro_set
{
if ( Comm::set_iterator_last(it) )
if ( BrokerComm::set_iterator_last(it) )
return rval;
add rval[Comm::refine_to_string(Comm::set_iterator_value(it))];
Comm::set_iterator_next(it);
add rval[BrokerComm::refine_to_string(BrokerComm::set_iterator_value(it))];
BrokerComm::set_iterator_next(it);
return comm_set_to_bro_set_recurse(it, rval);
}
function comm_set_to_bro_set(d: Comm::Data): bro_set
function comm_set_to_bro_set(d: BrokerComm::Data): bro_set
{
return comm_set_to_bro_set_recurse(Comm::set_iterator(d), bro_set());
return comm_set_to_bro_set_recurse(BrokerComm::set_iterator(d), bro_set());
}
function
comm_table_to_bro_table_recurse(it: opaque of Comm::TableIterator,
comm_table_to_bro_table_recurse(it: opaque of BrokerComm::TableIterator,
rval: bro_table): bro_table
{
if ( Comm::table_iterator_last(it) )
if ( BrokerComm::table_iterator_last(it) )
return rval;
local item = Comm::table_iterator_value(it);
rval[Comm::refine_to_string(item$key)] = Comm::refine_to_count(item$val);
Comm::table_iterator_next(it);
local item = BrokerComm::table_iterator_value(it);
rval[BrokerComm::refine_to_string(item$key)] = BrokerComm::refine_to_count(item$val);
BrokerComm::table_iterator_next(it);
return comm_table_to_bro_table_recurse(it, rval);
}
function comm_table_to_bro_table(d: Comm::Data): bro_table
function comm_table_to_bro_table(d: BrokerComm::Data): bro_table
{
return comm_table_to_bro_table_recurse(Comm::table_iterator(d),
return comm_table_to_bro_table_recurse(BrokerComm::table_iterator(d),
bro_table());
}
function comm_vector_to_bro_vector_recurse(it: opaque of Comm::VectorIterator,
function comm_vector_to_bro_vector_recurse(it: opaque of BrokerComm::VectorIterator,
rval: bro_vector): bro_vector
{
if ( Comm::vector_iterator_last(it) )
if ( BrokerComm::vector_iterator_last(it) )
return rval;
rval[|rval|] = Comm::refine_to_string(Comm::vector_iterator_value(it));
Comm::vector_iterator_next(it);
rval[|rval|] = BrokerComm::refine_to_string(BrokerComm::vector_iterator_value(it));
BrokerComm::vector_iterator_next(it);
return comm_vector_to_bro_vector_recurse(it, rval);
}
function comm_vector_to_bro_vector(d: Comm::Data): bro_vector
function comm_vector_to_bro_vector(d: BrokerComm::Data): bro_vector
{
return comm_vector_to_bro_vector_recurse(Comm::vector_iterator(d),
return comm_vector_to_bro_vector_recurse(BrokerComm::vector_iterator(d),
bro_vector());
}
event bro_init()
{
Comm::enable();
print Comm::data_type(Comm::data(T));
print Comm::data_type(Comm::data(+1));
print Comm::data_type(Comm::data(1));
print Comm::data_type(Comm::data(1.1));
print Comm::data_type(Comm::data("1 (how creative)"));
print Comm::data_type(Comm::data(1.1.1.1));
print Comm::data_type(Comm::data(1.1.1.1/1));
print Comm::data_type(Comm::data(1/udp));
print Comm::data_type(Comm::data(double_to_time(1)));
print Comm::data_type(Comm::data(1sec));
print Comm::data_type(Comm::data(Comm::BOOL));
BrokerComm::enable();
print BrokerComm::data_type(BrokerComm::data(T));
print BrokerComm::data_type(BrokerComm::data(+1));
print BrokerComm::data_type(BrokerComm::data(1));
print BrokerComm::data_type(BrokerComm::data(1.1));
print BrokerComm::data_type(BrokerComm::data("1 (how creative)"));
print BrokerComm::data_type(BrokerComm::data(1.1.1.1));
print BrokerComm::data_type(BrokerComm::data(1.1.1.1/1));
print BrokerComm::data_type(BrokerComm::data(1/udp));
print BrokerComm::data_type(BrokerComm::data(double_to_time(1)));
print BrokerComm::data_type(BrokerComm::data(1sec));
print BrokerComm::data_type(BrokerComm::data(BrokerComm::BOOL));
local s: bro_set = bro_set("one", "two", "three");
local t: bro_table = bro_table(["one"] = 1, ["two"] = 2, ["three"] = 3);
local v: bro_vector = bro_vector("zero", "one", "two");
local r: bro_record = bro_record($c = 1);
print Comm::data_type(Comm::data(s));
print Comm::data_type(Comm::data(t));
print Comm::data_type(Comm::data(v));
print Comm::data_type(Comm::data(r));
print BrokerComm::data_type(BrokerComm::data(s));
print BrokerComm::data_type(BrokerComm::data(t));
print BrokerComm::data_type(BrokerComm::data(v));
print BrokerComm::data_type(BrokerComm::data(r));
print "***************************";
print Comm::refine_to_bool(Comm::data(T));
print Comm::refine_to_bool(Comm::data(F));
print Comm::refine_to_int(Comm::data(+1));
print Comm::refine_to_int(Comm::data(+0));
print Comm::refine_to_int(Comm::data(-1));
print Comm::refine_to_count(Comm::data(1));
print Comm::refine_to_count(Comm::data(0));
print Comm::refine_to_double(Comm::data(1.1));
print Comm::refine_to_double(Comm::data(-11.1));
print Comm::refine_to_string(Comm::data("hello"));
print Comm::refine_to_addr(Comm::data(1.2.3.4));
print Comm::refine_to_subnet(Comm::data(192.168.1.1/16));
print Comm::refine_to_port(Comm::data(22/tcp));
print Comm::refine_to_time(Comm::data(double_to_time(42)));
print Comm::refine_to_interval(Comm::data(3min));
print Comm::refine_to_enum_name(Comm::data(Comm::BOOL));
print BrokerComm::refine_to_bool(BrokerComm::data(T));
print BrokerComm::refine_to_bool(BrokerComm::data(F));
print BrokerComm::refine_to_int(BrokerComm::data(+1));
print BrokerComm::refine_to_int(BrokerComm::data(+0));
print BrokerComm::refine_to_int(BrokerComm::data(-1));
print BrokerComm::refine_to_count(BrokerComm::data(1));
print BrokerComm::refine_to_count(BrokerComm::data(0));
print BrokerComm::refine_to_double(BrokerComm::data(1.1));
print BrokerComm::refine_to_double(BrokerComm::data(-11.1));
print BrokerComm::refine_to_string(BrokerComm::data("hello"));
print BrokerComm::refine_to_addr(BrokerComm::data(1.2.3.4));
print BrokerComm::refine_to_subnet(BrokerComm::data(192.168.1.1/16));
print BrokerComm::refine_to_port(BrokerComm::data(22/tcp));
print BrokerComm::refine_to_time(BrokerComm::data(double_to_time(42)));
print BrokerComm::refine_to_interval(BrokerComm::data(3min));
print BrokerComm::refine_to_enum_name(BrokerComm::data(BrokerComm::BOOL));
print "***************************";
local cs = Comm::data(s);
local cs = BrokerComm::data(s);
print comm_set_to_bro_set(cs);
cs = Comm::set_create();
print Comm::set_size(cs);
print Comm::set_insert(cs, Comm::data("hi"));
print Comm::set_size(cs);
print Comm::set_contains(cs, Comm::data("hi"));
print Comm::set_contains(cs, Comm::data("bye"));
print Comm::set_insert(cs, Comm::data("bye"));
print Comm::set_size(cs);
print Comm::set_remove(cs, Comm::data("hi"));
print Comm::set_size(cs);
print Comm::set_remove(cs, Comm::data("hi"));
cs = BrokerComm::set_create();
print BrokerComm::set_size(cs);
print BrokerComm::set_insert(cs, BrokerComm::data("hi"));
print BrokerComm::set_size(cs);
print BrokerComm::set_contains(cs, BrokerComm::data("hi"));
print BrokerComm::set_contains(cs, BrokerComm::data("bye"));
print BrokerComm::set_insert(cs, BrokerComm::data("bye"));
print BrokerComm::set_size(cs);
print BrokerComm::set_remove(cs, BrokerComm::data("hi"));
print BrokerComm::set_size(cs);
print BrokerComm::set_remove(cs, BrokerComm::data("hi"));
print comm_set_to_bro_set(cs);
Comm::set_clear(cs);
print Comm::set_size(cs);
BrokerComm::set_clear(cs);
print BrokerComm::set_size(cs);
print "***************************";
local ct = Comm::data(t);
local ct = BrokerComm::data(t);
print comm_table_to_bro_table(ct);
ct = Comm::table_create();
print Comm::table_size(ct);
print Comm::table_insert(ct, Comm::data("hi"), Comm::data(42));
print Comm::table_size(ct);
print Comm::table_contains(ct, Comm::data("hi"));
print Comm::refine_to_count(Comm::table_lookup(ct, Comm::data("hi")));
print Comm::table_contains(ct, Comm::data("bye"));
print Comm::table_insert(ct, Comm::data("bye"), Comm::data(7));
print Comm::table_size(ct);
print Comm::table_insert(ct, Comm::data("bye"), Comm::data(37));
print Comm::table_size(ct);
print Comm::refine_to_count(Comm::table_lookup(ct, Comm::data("bye")));
print Comm::table_remove(ct, Comm::data("hi"));
print Comm::table_size(ct);
ct = BrokerComm::table_create();
print BrokerComm::table_size(ct);
print BrokerComm::table_insert(ct, BrokerComm::data("hi"), BrokerComm::data(42));
print BrokerComm::table_size(ct);
print BrokerComm::table_contains(ct, BrokerComm::data("hi"));
print BrokerComm::refine_to_count(BrokerComm::table_lookup(ct, BrokerComm::data("hi")));
print BrokerComm::table_contains(ct, BrokerComm::data("bye"));
print BrokerComm::table_insert(ct, BrokerComm::data("bye"), BrokerComm::data(7));
print BrokerComm::table_size(ct);
print BrokerComm::table_insert(ct, BrokerComm::data("bye"), BrokerComm::data(37));
print BrokerComm::table_size(ct);
print BrokerComm::refine_to_count(BrokerComm::table_lookup(ct, BrokerComm::data("bye")));
print BrokerComm::table_remove(ct, BrokerComm::data("hi"));
print BrokerComm::table_size(ct);
print "***************************";
local cv = Comm::data(v);
local cv = BrokerComm::data(v);
print comm_vector_to_bro_vector(cv);
cv = Comm::vector_create();
print Comm::vector_size(cv);
print Comm::vector_insert(cv, Comm::data("hi"), 0);
print Comm::vector_insert(cv, Comm::data("hello"), 1);
print Comm::vector_insert(cv, Comm::data("greetings"), 2);
print Comm::vector_insert(cv, Comm::data("salutations"), 1);
cv = BrokerComm::vector_create();
print BrokerComm::vector_size(cv);
print BrokerComm::vector_insert(cv, BrokerComm::data("hi"), 0);
print BrokerComm::vector_insert(cv, BrokerComm::data("hello"), 1);
print BrokerComm::vector_insert(cv, BrokerComm::data("greetings"), 2);
print BrokerComm::vector_insert(cv, BrokerComm::data("salutations"), 1);
print comm_vector_to_bro_vector(cv);
print Comm::vector_size(cv);
print Comm::vector_replace(cv, Comm::data("bah"), 2);
print Comm::vector_lookup(cv, 2);
print Comm::vector_lookup(cv, 0);
print BrokerComm::vector_size(cv);
print BrokerComm::vector_replace(cv, BrokerComm::data("bah"), 2);
print BrokerComm::vector_lookup(cv, 2);
print BrokerComm::vector_lookup(cv, 0);
print comm_vector_to_bro_vector(cv);
print Comm::vector_remove(cv, 2);
print BrokerComm::vector_remove(cv, 2);
print comm_vector_to_bro_vector(cv);
print Comm::vector_size(cv);
print BrokerComm::vector_size(cv);
print "***************************";
local cr = Comm::data(r);
local cr = BrokerComm::data(r);
print comm_record_to_bro_record(cr);
r$a = "test";
cr = Comm::data(r);
cr = BrokerComm::data(r);
print comm_record_to_bro_record(cr);
r$b = "testagain";
cr = Comm::data(r);
cr = BrokerComm::data(r);
print comm_record_to_bro_record(cr);
cr = Comm::record_create(3);
print Comm::record_size(cr);
print Comm::record_assign(cr, Comm::data("hi"), 0);
print Comm::record_assign(cr, Comm::data("hello"), 1);
print Comm::record_assign(cr, Comm::data(37), 2);
print Comm::record_lookup(cr, 0);
print Comm::record_lookup(cr, 1);
print Comm::record_lookup(cr, 2);
print Comm::record_size(cr);
cr = BrokerComm::record_create(3);
print BrokerComm::record_size(cr);
print BrokerComm::record_assign(cr, BrokerComm::data("hi"), 0);
print BrokerComm::record_assign(cr, BrokerComm::data("hello"), 1);
print BrokerComm::record_assign(cr, BrokerComm::data(37), 2);
print BrokerComm::record_lookup(cr, 0);
print BrokerComm::record_lookup(cr, 1);
print BrokerComm::record_lookup(cr, 2);
print BrokerComm::record_size(cr);
}

46
testing/btest/comm/master_store.bro
View file

@ -6,7 +6,7 @@
redef exit_only_after_terminate = T;
global h: opaque of Store::Handle;
global h: opaque of BrokerStore::Handle;
global lookup_count = 0;
const lookup_expect_count = 5;
global exists_count = 0;
@ -20,13 +20,13 @@ global query_timeout = 5sec;
event test_clear()
{
Store::clear(h);
BrokerStore::clear(h);
event test_size("after clear");
}
event test_size(where: string)
{
when ( local res = Store::size(h) )
when ( local res = BrokerStore::size(h) )
{
if ( where == "" )
{
@ -52,7 +52,7 @@ event test_size(where: string)
event test_keys()
{
when ( local res = Store::keys(h) )
when ( local res = BrokerStore::keys(h) )
{
print fmt("keys: %s", res);
event test_size();
@ -66,7 +66,7 @@ event test_keys()
event test_pop(key: string)
{
when ( local lres = Store::pop_left(h, Comm::data(key)) )
when ( local lres = BrokerStore::pop_left(h, BrokerComm::data(key)) )
{
print fmt("pop_left(%s): %s", key, lres);
++pop_count;
@ -83,7 +83,7 @@ event test_pop(key: string)
event test_keys();
}
when ( local rres = Store::pop_right(h, Comm::data(key)) )
when ( local rres = BrokerStore::pop_right(h, BrokerComm::data(key)) )
{
print fmt("pop_right(%s): %s", key, rres);
++pop_count;
@ -103,7 +103,7 @@ event test_pop(key: string)
function do_exists(key: string)
{
when ( local res = Store::exists(h, Comm::data(key)) )
when ( local res = BrokerStore::exists(h, BrokerComm::data(key)) )
{
print fmt("exists(%s): %s", key, res);
++exists_count;
@ -123,7 +123,7 @@ function do_exists(key: string)
event test_erase()
{
Store::erase(h, Comm::data("two"));
BrokerStore::erase(h, BrokerComm::data("two"));
do_exists("one");
do_exists("two");
do_exists("myset");
@ -132,7 +132,7 @@ event test_erase()
function do_lookup(key: string)
{
when ( local res = Store::lookup(h, Comm::data(key)) )
when ( local res = BrokerStore::lookup(h, BrokerComm::data(key)) )
{
print fmt("lookup(%s): %s", key, res);
++lookup_count;
@ -150,29 +150,29 @@ function do_lookup(key: string)
}
}
function dv(d: Comm::Data): Comm::DataVector
function dv(d: BrokerComm::Data): BrokerComm::DataVector
{
local rval: Comm::DataVector;
local rval: BrokerComm::DataVector;
rval[0] = d;
return rval;
}
event bro_init()
{
Comm::enable();
BrokerComm::enable();
local myset: set[string] = {"a", "b", "c"};
local myvec: vector of string = {"alpha", "beta", "gamma"};
h = Store::create_master("master");
Store::insert(h, Comm::data("one"), Comm::data(110));
Store::insert(h, Comm::data("two"), Comm::data(223));
Store::insert(h, Comm::data("myset"), Comm::data(myset));
Store::insert(h, Comm::data("myvec"), Comm::data(myvec));
Store::increment(h, Comm::data("one"));
Store::decrement(h, Comm::data("two"));
Store::add_to_set(h, Comm::data("myset"), Comm::data("d"));
Store::remove_from_set(h, Comm::data("myset"), Comm::data("b"));
Store::push_left(h, Comm::data("myvec"), dv(Comm::data("delta")));
Store::push_right(h, Comm::data("myvec"), dv(Comm::data("omega")));
h = BrokerStore::create_master("master");
BrokerStore::insert(h, BrokerComm::data("one"), BrokerComm::data(110));
BrokerStore::insert(h, BrokerComm::data("two"), BrokerComm::data(223));
BrokerStore::insert(h, BrokerComm::data("myset"), BrokerComm::data(myset));
BrokerStore::insert(h, BrokerComm::data("myvec"), BrokerComm::data(myvec));
BrokerStore::increment(h, BrokerComm::data("one"));
BrokerStore::decrement(h, BrokerComm::data("two"));
BrokerStore::add_to_set(h, BrokerComm::data("myset"), BrokerComm::data("d"));
BrokerStore::remove_from_set(h, BrokerComm::data("myset"), BrokerComm::data("b"));
BrokerStore::push_left(h, BrokerComm::data("myvec"), dv(BrokerComm::data("delta")));
BrokerStore::push_right(h, BrokerComm::data("myvec"), dv(BrokerComm::data("omega")));
do_lookup("one");
do_lookup("two");
do_lookup("myset");

32
testing/btest/comm/remote_event.test
View file

@ -18,10 +18,10 @@ global auto_event_handler: event(msg: string, c: count);
event bro_init()
{
Comm::enable();
Comm::subscribe_to_events("bro/event/");
Comm::auto_event("bro/event/my_topic", auto_event_handler);
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::subscribe_to_events("bro/event/");
BrokerComm::auto_event("bro/event/my_topic", auto_event_handler);
BrokerComm::listen(broker_port, "127.0.0.1");
}
global event_count = 0;
@ -39,8 +39,8 @@ event event_handler(msg: string, n: count)
}
event auto_event_handler(msg, n);
local args = Comm::event_args(event_handler, "pong", n);
Comm::event("bro/event/my_topic", args);
local args = BrokerComm::event_args(event_handler, "pong", n);
BrokerComm::event("bro/event/my_topic", args);
}
@TEST-END-FILE
@ -55,24 +55,24 @@ global auto_event_handler: event(msg: string, c: count);
event bro_init()
{
Comm::enable();
Comm::subscribe_to_events("bro/event/my_topic");
Comm::connect("127.0.0.1", broker_port, 1secs);
BrokerComm::enable();
BrokerComm::subscribe_to_events("bro/event/my_topic");
BrokerComm::connect("127.0.0.1", broker_port, 1secs);
}
global event_count = 0;
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established", peer_address, peer_port;
local args = Comm::event_args(event_handler, "ping", event_count);
Comm::event("bro/event/hi", args);
print "BrokerComm::outgoing_connection_established", peer_address, peer_port;
local args = BrokerComm::event_args(event_handler, "ping", event_count);
BrokerComm::event("bro/event/hi", args);
++event_count;
}
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();
@ -81,8 +81,8 @@ event Comm::outgoing_connection_broken(peer_address: string,
event event_handler(msg: string, n: count)
{
print "got event msg", msg, n;
local args = Comm::event_args(event_handler, "ping", event_count);
Comm::event("bro/event/hi", args);
local args = BrokerComm::event_args(event_handler, "ping", event_count);
BrokerComm::event("bro/event/hi", args);
++event_count;
}

16
testing/btest/comm/remote_log.test
View file

@ -28,7 +28,7 @@ export {
event bro_init() &priority=5
{
Comm::enable();
BrokerComm::enable();
Log::create_stream(Test::LOG, [$columns=Test::Info, $ev=log_test]);
}
@ -41,8 +41,8 @@ redef exit_only_after_terminate = T;
event bro_init()
{
Comm::subscribe_to_logs("bro/log/");
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::subscribe_to_logs("bro/log/");
BrokerComm::listen(broker_port, "127.0.0.1");
}
event Test::log_test(rec: Test::Info)
@ -62,8 +62,8 @@ redef exit_only_after_terminate = T;
event bro_init()
{
Comm::enable_remote_logs(Test::LOG);
Comm::connect("127.0.0.1", broker_port, 1secs);
BrokerComm::enable_remote_logs(Test::LOG);
BrokerComm::connect("127.0.0.1", broker_port, 1secs);
}
global n = 0;
@ -80,15 +80,15 @@ event do_write()
}
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established", peer_address, peer_port;
print "BrokerComm::outgoing_connection_established", peer_address, peer_port;
event do_write();
}
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();

28
testing/btest/comm/remote_print.test
View file

@ -15,16 +15,16 @@ redef exit_only_after_terminate = T;
event bro_init()
{
Comm::enable();
Comm::listen(broker_port, "127.0.0.1");
Comm::subscribe_to_prints("bro/print/");
BrokerComm::enable();
BrokerComm::listen(broker_port, "127.0.0.1");
BrokerComm::subscribe_to_prints("bro/print/");
}
global messages_to_recv = 6;
global messages_sent = 0;
global messages_recv = 0;
event Comm::print_handler(msg: string)
event BrokerComm::print_handler(msg: string)
{
++messages_recv;
print "got print msg", msg;
@ -35,7 +35,7 @@ event Comm::print_handler(msg: string)
return;
}
Comm::print("bro/print/my_topic", fmt("pong %d", messages_sent));
BrokerComm::print("bro/print/my_topic", fmt("pong %d", messages_sent));
++messages_sent;
}
@ -48,35 +48,35 @@ redef exit_only_after_terminate = T;
event bro_init()
{
Comm::enable();
Comm::subscribe_to_prints("bro/print/my_topic");
Comm::connect("127.0.0.1", broker_port, 1secs);
BrokerComm::enable();
BrokerComm::subscribe_to_prints("bro/print/my_topic");
BrokerComm::connect("127.0.0.1", broker_port, 1secs);
}
global messages_sent = 0;
global messages_recv = 0;
global peer_disconnected = F;
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established", peer_address, peer_port;
Comm::print("bro/print/hi", fmt("ping %d", messages_sent));
print "BrokerComm::outgoing_connection_established", peer_address, peer_port;
BrokerComm::print("bro/print/hi", fmt("ping %d", messages_sent));
++messages_sent;
}
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();
}
event Comm::print_handler(msg: string)
event BrokerComm::print_handler(msg: string)
{
++messages_recv;
print "got print msg", msg;
Comm::print("bro/print/hi", fmt("ping %d", messages_sent));
BrokerComm::print("bro/print/hi", fmt("ping %d", messages_sent));
++messages_sent;
}

10
testing/btest/doc/sphinx/include-doc_frameworks_comm_connecting-connector_bro.btest
View file

@ -5,19 +5,19 @@ connecting-connector.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "connector";
redef BrokerComm::endpoint_name = "connector";
event bro_init()
{
Comm::enable();
Comm::connect("127.0.0.1", broker_port, 1sec);
BrokerComm::enable();
BrokerComm::connect("127.0.0.1", broker_port, 1sec);
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established",
print "BrokerComm::outgoing_connection_established",
peer_address, peer_port, peer_name;
terminate();
}

14
testing/btest/doc/sphinx/include-doc_frameworks_comm_connecting-listener_bro.btest
View file

@ -5,21 +5,21 @@ connecting-listener.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "listener";
redef BrokerComm::endpoint_name = "listener";
event bro_init()
{
Comm::enable();
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::listen(broker_port, "127.0.0.1");
}
event Comm::incoming_connection_established(peer_name: string)
event BrokerComm::incoming_connection_established(peer_name: string)
{
print "Comm::incoming_connection_established", peer_name;
print "BrokerComm::incoming_connection_established", peer_name;
}
event Comm::incoming_connection_broken(peer_name: string)
event BrokerComm::incoming_connection_broken(peer_name: string)
{
print "Comm::incoming_connection_broken", peer_name;
print "BrokerComm::incoming_connection_broken", peer_name;
terminate();
}

20
testing/btest/doc/sphinx/include-doc_frameworks_comm_events-connector_bro.btest
View file

@ -4,31 +4,31 @@ events-connector.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "connector";
redef BrokerComm::endpoint_name = "connector";
global my_event: event(msg: string, c: count);
global my_auto_event: event(msg: string, c: count);
event bro_init()
{
Comm::enable();
Comm::connect("127.0.0.1", broker_port, 1sec);
Comm::auto_event("bro/event/my_auto_event", my_auto_event);
BrokerComm::enable();
BrokerComm::connect("127.0.0.1", broker_port, 1sec);
BrokerComm::auto_event("bro/event/my_auto_event", my_auto_event);
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established",
print "BrokerComm::outgoing_connection_established",
peer_address, peer_port, peer_name;
Comm::event("bro/event/my_event", Comm::event_args(my_event, "hi", 0));
BrokerComm::event("bro/event/my_event", BrokerComm::event_args(my_event, "hi", 0));
event my_auto_event("stuff", 88);
Comm::event("bro/event/my_event", Comm::event_args(my_event, "...", 1));
BrokerComm::event("bro/event/my_event", BrokerComm::event_args(my_event, "...", 1));
event my_auto_event("more stuff", 51);
Comm::event("bro/event/my_event", Comm::event_args(my_event, "bye", 2));
BrokerComm::event("bro/event/my_event", BrokerComm::event_args(my_event, "bye", 2));
}
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();

12
testing/btest/doc/sphinx/include-doc_frameworks_comm_events-listener_bro.btest
View file

@ -5,21 +5,21 @@ events-listener.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "listener";
redef BrokerComm::endpoint_name = "listener";
global msg_count = 0;
global my_event: event(msg: string, c: count);
global my_auto_event: event(msg: string, c: count);
event bro_init()
{
Comm::enable();
Comm::subscribe_to_events("bro/event/");
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::subscribe_to_events("bro/event/");
BrokerComm::listen(broker_port, "127.0.0.1");
}
event Comm::incoming_connection_established(peer_name: string)
event BrokerComm::incoming_connection_established(peer_name: string)
{
print "Comm::incoming_connection_established", peer_name;
print "BrokerComm::incoming_connection_established", peer_name;
}
event my_event(msg: string, c: count)

14
testing/btest/doc/sphinx/include-doc_frameworks_comm_logs-connector_bro.btest
View file

@ -6,16 +6,16 @@ logs-connector.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "connector";
redef BrokerComm::endpoint_name = "connector";
redef Log::enable_local_logging = F;
redef Log::enable_remote_logging = F;
global n = 0;
event bro_init()
{
Comm::enable();
Comm::enable_remote_logs(Test::LOG);
Comm::connect("127.0.0.1", broker_port, 1sec);
BrokerComm::enable();
BrokerComm::enable_remote_logs(Test::LOG);
BrokerComm::connect("127.0.0.1", broker_port, 1sec);
}
event do_write()
@ -28,16 +28,16 @@ event do_write()
event do_write();
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established",
print "BrokerComm::outgoing_connection_established",
peer_address, peer_port, peer_name;
event do_write();
}
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();

12
testing/btest/doc/sphinx/include-doc_frameworks_comm_logs-listener_bro.btest
View file

@ -6,18 +6,18 @@ logs-listener.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "listener";
redef BrokerComm::endpoint_name = "listener";
event bro_init()
{
Comm::enable();
Comm::subscribe_to_logs("bro/log/Test::LOG");
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::subscribe_to_logs("bro/log/Test::LOG");
BrokerComm::listen(broker_port, "127.0.0.1");
}
event Comm::incoming_connection_established(peer_name: string)
event BrokerComm::incoming_connection_established(peer_name: string)
{
print "Comm::incoming_connection_established", peer_name;
print "BrokerComm::incoming_connection_established", peer_name;
}
event Test::log_test(rec: Test::Info)

18
testing/btest/doc/sphinx/include-doc_frameworks_comm_printing-connector_bro.btest
View file

@ -4,26 +4,26 @@ printing-connector.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "connector";
redef BrokerComm::endpoint_name = "connector";
event bro_init()
{
Comm::enable();
Comm::connect("127.0.0.1", broker_port, 1sec);
BrokerComm::enable();
BrokerComm::connect("127.0.0.1", broker_port, 1sec);
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
print "Comm::outgoing_connection_established",
print "BrokerComm::outgoing_connection_established",
peer_address, peer_port, peer_name;
Comm::print("bro/print/hi", "hello");
Comm::print("bro/print/stuff", "...");
Comm::print("bro/print/bye", "goodbye");
BrokerComm::print("bro/print/hi", "hello");
BrokerComm::print("bro/print/stuff", "...");
BrokerComm::print("bro/print/bye", "goodbye");
}
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();

14
testing/btest/doc/sphinx/include-doc_frameworks_comm_printing-listener_bro.btest
View file

@ -5,22 +5,22 @@ printing-listener.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
redef Comm::endpoint_name = "listener";
redef BrokerComm::endpoint_name = "listener";
global msg_count = 0;
event bro_init()
{
Comm::enable();
Comm::subscribe_to_prints("bro/print/");
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::subscribe_to_prints("bro/print/");
BrokerComm::listen(broker_port, "127.0.0.1");
}
event Comm::incoming_connection_established(peer_name: string)
event BrokerComm::incoming_connection_established(peer_name: string)
{
print "Comm::incoming_connection_established", peer_name;
print "BrokerComm::incoming_connection_established", peer_name;
}
event Comm::print_handler(msg: string)
event BrokerComm::print_handler(msg: string)
{
++msg_count;
print "got print message", msg;

40
testing/btest/doc/sphinx/include-doc_frameworks_comm_stores-connector_bro.btest
View file

@ -5,42 +5,42 @@ stores-connector.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
global h: opaque of Store::Handle;
global h: opaque of BrokerStore::Handle;
function dv(d: Comm::Data): Comm::DataVector
function dv(d: BrokerComm::Data): BrokerComm::DataVector
{
local rval: Comm::DataVector;
local rval: BrokerComm::DataVector;
rval[0] = d;
return rval;
}
global ready: event();
event Comm::outgoing_connection_broken(peer_address: string,
event BrokerComm::outgoing_connection_broken(peer_address: string,
peer_port: port)
{
terminate();
}
event Comm::outgoing_connection_established(peer_address: string,
event BrokerComm::outgoing_connection_established(peer_address: string,
peer_port: port,
peer_name: string)
{
local myset: set[string] = {"a", "b", "c"};
local myvec: vector of string = {"alpha", "beta", "gamma"};
h = Store::create_master("mystore");
Store::insert(h, Comm::data("one"), Comm::data(110));
Store::insert(h, Comm::data("two"), Comm::data(223));
Store::insert(h, Comm::data("myset"), Comm::data(myset));
Store::insert(h, Comm::data("myvec"), Comm::data(myvec));
Store::increment(h, Comm::data("one"));
Store::decrement(h, Comm::data("two"));
Store::add_to_set(h, Comm::data("myset"), Comm::data("d"));
Store::remove_from_set(h, Comm::data("myset"), Comm::data("b"));
Store::push_left(h, Comm::data("myvec"), dv(Comm::data("delta")));
Store::push_right(h, Comm::data("myvec"), dv(Comm::data("omega")));
h = BrokerStore::create_master("mystore");
BrokerStore::insert(h, BrokerComm::data("one"), BrokerComm::data(110));
BrokerStore::insert(h, BrokerComm::data("two"), BrokerComm::data(223));
BrokerStore::insert(h, BrokerComm::data("myset"), BrokerComm::data(myset));
BrokerStore::insert(h, BrokerComm::data("myvec"), BrokerComm::data(myvec));
BrokerStore::increment(h, BrokerComm::data("one"));
BrokerStore::decrement(h, BrokerComm::data("two"));
BrokerStore::add_to_set(h, BrokerComm::data("myset"), BrokerComm::data("d"));
BrokerStore::remove_from_set(h, BrokerComm::data("myset"), BrokerComm::data("b"));
BrokerStore::push_left(h, BrokerComm::data("myvec"), dv(BrokerComm::data("delta")));
BrokerStore::push_right(h, BrokerComm::data("myvec"), dv(BrokerComm::data("omega")));
when ( local res = Store::size(h) )
when ( local res = BrokerStore::size(h) )
{
print "master size", res;
event ready();
@ -51,7 +51,7 @@ event Comm::outgoing_connection_established(peer_address: string,
event bro_init()
{
Comm::enable();
Comm::connect("127.0.0.1", broker_port, 1secs);
Comm::auto_event("bro/event/ready", ready);
BrokerComm::enable();
BrokerComm::connect("127.0.0.1", broker_port, 1secs);
BrokerComm::auto_event("bro/event/ready", ready);
}

22
testing/btest/doc/sphinx/include-doc_frameworks_comm_stores-listener_bro.btest
View file

@ -5,13 +5,13 @@ stores-listener.bro
const broker_port: port &redef;
redef exit_only_after_terminate = T;
global h: opaque of Store::Handle;
global h: opaque of BrokerStore::Handle;
global expected_key_count = 4;
global key_count = 0;
function do_lookup(key: string)
{
when ( local res = Store::lookup(h, Comm::data(key)) )
when ( local res = BrokerStore::lookup(h, BrokerComm::data(key)) )
{
++key_count;
print "lookup", key, res;
@ -25,15 +25,15 @@ function do_lookup(key: string)
event ready()
{
h = Store::create_clone("mystore");
h = BrokerStore::create_clone("mystore");
when ( local res = Store::keys(h) )
when ( local res = BrokerStore::keys(h) )
{
print "clone keys", res;
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 0)));
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 1)));
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 2)));
do_lookup(Comm::refine_to_string(Comm::vector_lookup(res$result, 3)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 0)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 1)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 2)));
do_lookup(BrokerComm::refine_to_string(BrokerComm::vector_lookup(res$result, 3)));
}
timeout 10sec
{ print "timeout"; }
@ -41,7 +41,7 @@ event ready()
event bro_init()
{
Comm::enable();
Comm::subscribe_to_events("bro/event/ready");
Comm::listen(broker_port, "127.0.0.1");
BrokerComm::enable();
BrokerComm::subscribe_to_events("bro/event/ready");
BrokerComm::listen(broker_port, "127.0.0.1");
}

2
testing/btest/doc/sphinx/include-doc_frameworks_comm_testlog_bro.btest
View file

@ -18,6 +18,6 @@ export {
event bro_init() &priority=5
{
Comm::enable();
BrokerComm::enable();
Log::create_stream(Test::LOG, [$columns=Test::Info, $ev=log_test]);
}