diff --git a/doc/frameworks/comm.rst b/doc/frameworks/broker.rst similarity index 90% rename from doc/frameworks/comm.rst rename to doc/frameworks/broker.rst index 0c0dd80845..26006089d1 100644 --- a/doc/frameworks/comm.rst +++ b/doc/frameworks/broker.rst @@ -1,5 +1,5 @@ -.. _comm-framework: +.. _brokercomm-framework: ====================================== Broker-Enabled Communication Framework @@ -27,7 +27,7 @@ and then monitor connection status updates via :bro:see:`BrokerComm::incoming_connection_established` and :bro:see:`BrokerComm::incoming_connection_broken`. -.. btest-include:: ${DOC_ROOT}/frameworks/comm/connecting-listener.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/connecting-listener.bro Bro can initiate outgoing connections by calling :bro:see:`BrokerComm::connect` and then monitor connection status updates via @@ -35,7 +35,7 @@ and then monitor connection status updates via :bro:see:`BrokerComm::outgoing_connection_broken`, and :bro:see:`BrokerComm::outgoing_connection_incompatible`. -.. btest-include:: ${DOC_ROOT}/frameworks/comm/connecting-connector.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/connecting-connector.bro Remote Printing =============== @@ -46,11 +46,11 @@ prefix of interest and then create an event handler for :bro:see:`BrokerComm::print_handler` to handle any print messages that are received. -.. btest-include:: ${DOC_ROOT}/frameworks/comm/printing-listener.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/printing-listener.bro To send remote print messages, just call :bro:see:`BrokerComm::print`. -.. btest-include:: ${DOC_ROOT}/frameworks/comm/printing-connector.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/printing-connector.bro Notice that the subscriber only used the prefix "bro/print/", but is able to receive messages with full topics of "bro/print/hi", @@ -75,7 +75,7 @@ Receiving remote events is similar to remote prints. Just use :bro:see:`BrokerComm::subscribe_to_events` and possibly define any new events along with handlers that peers may want to send. -.. btest-include:: ${DOC_ROOT}/frameworks/comm/events-listener.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/events-listener.bro To send events, there are two choices. The first is to use call :bro:see:`BrokerComm::event` directly. The second option is to use @@ -83,7 +83,7 @@ To send events, there are two choices. The first is to use call automatically sent to peers whenever it is called locally via the normal event invocation syntax. -.. btest-include:: ${DOC_ROOT}/frameworks/comm/events-connector.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/events-connector.bro Again, the subscription model is prefix-based. @@ -105,20 +105,20 @@ parameter of the message. Remote Logging ============== -.. btest-include:: ${DOC_ROOT}/frameworks/comm/testlog.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/testlog.bro Use :bro:see:`BrokerComm::subscribe_to_logs` to advertise interest in logs written by peers. The topic names that Bro uses are implicitly of the form "bro/log/". -.. btest-include:: ${DOC_ROOT}/frameworks/comm/logs-listener.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/logs-listener.bro To send remote logs either use :bro:see:`Log::enable_remote_logging` or :bro:see:`BrokerComm::enable_remote_logs`. The former allows any log stream to be sent to peers while the later toggles remote logging for particular streams. -.. btest-include:: ${DOC_ROOT}/frameworks/comm/logs-connector.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/logs-connector.bro Message Format -------------- @@ -189,9 +189,9 @@ Data stores also support expiration on a per-key basis either using an absolute point in time or a relative amount of time since the entry's last modification time. -.. btest-include:: ${DOC_ROOT}/frameworks/comm/stores-listener.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/stores-listener.bro -.. btest-include:: ${DOC_ROOT}/frameworks/comm/stores-connector.bro +.. btest-include:: ${DOC_ROOT}/frameworks/broker/stores-connector.bro In the above example, if a local copy of the store contents isn't needed, just replace the :bro:see:`BrokerStore::create_clone` call with diff --git a/doc/frameworks/comm/connecting-connector.bro b/doc/frameworks/broker/connecting-connector.bro similarity index 100% rename from doc/frameworks/comm/connecting-connector.bro rename to doc/frameworks/broker/connecting-connector.bro diff --git a/doc/frameworks/comm/connecting-listener.bro b/doc/frameworks/broker/connecting-listener.bro similarity index 100% rename from doc/frameworks/comm/connecting-listener.bro rename to doc/frameworks/broker/connecting-listener.bro diff --git a/doc/frameworks/comm/events-connector.bro b/doc/frameworks/broker/events-connector.bro similarity index 100% rename from doc/frameworks/comm/events-connector.bro rename to doc/frameworks/broker/events-connector.bro diff --git a/doc/frameworks/comm/events-listener.bro b/doc/frameworks/broker/events-listener.bro similarity index 100% rename from doc/frameworks/comm/events-listener.bro rename to doc/frameworks/broker/events-listener.bro diff --git a/doc/frameworks/comm/logs-connector.bro b/doc/frameworks/broker/logs-connector.bro similarity index 100% rename from doc/frameworks/comm/logs-connector.bro rename to doc/frameworks/broker/logs-connector.bro diff --git a/doc/frameworks/comm/logs-listener.bro b/doc/frameworks/broker/logs-listener.bro similarity index 100% rename from doc/frameworks/comm/logs-listener.bro rename to doc/frameworks/broker/logs-listener.bro diff --git a/doc/frameworks/comm/printing-connector.bro b/doc/frameworks/broker/printing-connector.bro similarity index 100% rename from doc/frameworks/comm/printing-connector.bro rename to doc/frameworks/broker/printing-connector.bro diff --git a/doc/frameworks/comm/printing-listener.bro b/doc/frameworks/broker/printing-listener.bro similarity index 100% rename from doc/frameworks/comm/printing-listener.bro rename to doc/frameworks/broker/printing-listener.bro diff --git a/doc/frameworks/comm/stores-connector.bro b/doc/frameworks/broker/stores-connector.bro similarity index 100% rename from doc/frameworks/comm/stores-connector.bro rename to doc/frameworks/broker/stores-connector.bro diff --git a/doc/frameworks/comm/stores-listener.bro b/doc/frameworks/broker/stores-listener.bro similarity index 100% rename from doc/frameworks/comm/stores-listener.bro rename to doc/frameworks/broker/stores-listener.bro diff --git a/doc/frameworks/comm/testlog.bro b/doc/frameworks/broker/testlog.bro similarity index 100% rename from doc/frameworks/comm/testlog.bro rename to doc/frameworks/broker/testlog.bro diff --git a/doc/frameworks/index.rst b/doc/frameworks/index.rst index 9819b803f0..028f95af21 100644 --- a/doc/frameworks/index.rst +++ b/doc/frameworks/index.rst @@ -14,4 +14,4 @@ Frameworks notice signatures sumstats - comm + broker diff --git a/scripts/base/frameworks/comm/__load__.bro b/scripts/base/frameworks/broker/__load__.bro similarity index 100% rename from scripts/base/frameworks/comm/__load__.bro rename to scripts/base/frameworks/broker/__load__.bro diff --git a/scripts/base/frameworks/comm/main.bro b/scripts/base/frameworks/broker/main.bro similarity index 100% rename from scripts/base/frameworks/comm/main.bro rename to scripts/base/frameworks/broker/main.bro diff --git a/scripts/base/init-bare.bro b/scripts/base/init-bare.bro index 5dc3345b09..c62549f8b3 100644 --- a/scripts/base/init-bare.bro +++ b/scripts/base/init-bare.bro @@ -3360,7 +3360,7 @@ const bits_per_uid: count = 96 &redef; # Load these frameworks here because they use fairly deep integration with # BiFs and script-land defined types. -@load base/frameworks/comm +@load base/frameworks/broker @load base/frameworks/logging @load base/frameworks/input @load base/frameworks/analyzer diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 974c23c3a3..e73324c4d1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -162,11 +162,11 @@ add_subdirectory(logging) add_subdirectory(probabilistic) if ( ENABLE_BROKER ) - add_subdirectory(comm) + add_subdirectory(broker) else () # Just to satisfy coverage unit tests until new Broker-based # communication is enabled by default. - add_subdirectory(comm-dummy) + add_subdirectory(broker-dummy) endif () set(bro_SUBDIRS diff --git a/src/EventHandler.cc b/src/EventHandler.cc index 2874c56c03..3f1fd71ddf 100644 --- a/src/EventHandler.cc +++ b/src/EventHandler.cc @@ -6,8 +6,8 @@ #include "NetVar.h" #ifdef ENABLE_BROKER -#include "comm/Manager.h" -#include "comm/Data.h" +#include "broker/Manager.h" +#include "broker/Data.h" #endif EventHandler::EventHandler(const char* arg_name) diff --git a/src/Net.cc b/src/Net.cc index 820ccd2f76..af542cb1a6 100644 --- a/src/Net.cc +++ b/src/Net.cc @@ -35,7 +35,7 @@ #include "plugin/Manager.h" #ifdef ENABLE_BROKER -#include "comm/Manager.h" +#include "broker/Manager.h" #endif extern "C" { diff --git a/src/Stats.cc b/src/Stats.cc index 437fb6de4b..00f603cba7 100644 --- a/src/Stats.cc +++ b/src/Stats.cc @@ -11,7 +11,7 @@ #include "threading/Manager.h" #ifdef ENABLE_BROKER -#include "comm/Manager.h" +#include "broker/Manager.h" #endif int killed_by_inactivity = 0; diff --git a/src/comm-dummy/CMakeLists.txt b/src/broker-dummy/CMakeLists.txt similarity index 73% rename from src/comm-dummy/CMakeLists.txt rename to src/broker-dummy/CMakeLists.txt index cddea1342d..08c5f3214c 100644 --- a/src/comm-dummy/CMakeLists.txt +++ b/src/broker-dummy/CMakeLists.txt @@ -9,5 +9,5 @@ bif_target(data.bif) bif_target(messaging.bif) bif_target(store.bif) -bro_add_subdir_library(comm_dummy ${BIF_OUTPUT_CC}) -add_dependencies(bro_comm_dummy generate_outputs) +bro_add_subdir_library(broker_dummy ${BIF_OUTPUT_CC}) +add_dependencies(bro_broker_dummy generate_outputs) diff --git a/src/comm-dummy/comm.bif b/src/broker-dummy/comm.bif similarity index 100% rename from src/comm-dummy/comm.bif rename to src/broker-dummy/comm.bif diff --git a/src/comm-dummy/data.bif b/src/broker-dummy/data.bif similarity index 100% rename from src/comm-dummy/data.bif rename to src/broker-dummy/data.bif diff --git a/src/comm-dummy/messaging.bif b/src/broker-dummy/messaging.bif similarity index 100% rename from src/comm-dummy/messaging.bif rename to src/broker-dummy/messaging.bif diff --git a/src/comm-dummy/store.bif b/src/broker-dummy/store.bif similarity index 100% rename from src/comm-dummy/store.bif rename to src/broker-dummy/store.bif diff --git a/src/comm/CMakeLists.txt b/src/broker/CMakeLists.txt similarity index 82% rename from src/comm/CMakeLists.txt rename to src/broker/CMakeLists.txt index ef41c605c7..7329bfd46e 100644 --- a/src/comm/CMakeLists.txt +++ b/src/broker/CMakeLists.txt @@ -24,5 +24,5 @@ bif_target(data.bif) bif_target(messaging.bif) bif_target(store.bif) -bro_add_subdir_library(comm ${comm_SRCS} ${BIF_OUTPUT_CC}) -add_dependencies(bro_comm generate_outputs) +bro_add_subdir_library(brokercomm ${comm_SRCS} ${BIF_OUTPUT_CC}) +add_dependencies(bro_brokercomm generate_outputs) diff --git a/src/comm/Data.cc b/src/broker/Data.cc similarity index 99% rename from src/comm/Data.cc rename to src/broker/Data.cc index 96377284d1..45f5415b8a 100644 --- a/src/comm/Data.cc +++ b/src/broker/Data.cc @@ -1,5 +1,5 @@ #include "Data.h" -#include "comm/data.bif.h" +#include "broker/data.bif.h" #include #include diff --git a/src/comm/Data.h b/src/broker/Data.h similarity index 100% rename from src/comm/Data.h rename to src/broker/Data.h diff --git a/src/comm/Manager.cc b/src/broker/Manager.cc similarity index 99% rename from src/comm/Manager.cc rename to src/broker/Manager.cc index 3eceba0096..31599ea1fc 100644 --- a/src/comm/Manager.cc +++ b/src/broker/Manager.cc @@ -8,10 +8,10 @@ #include "util.h" #include "Var.h" #include "Reporter.h" -#include "comm/comm.bif.h" -#include "comm/data.bif.h" -#include "comm/messaging.bif.h" -#include "comm/store.bif.h" +#include "broker/comm.bif.h" +#include "broker/data.bif.h" +#include "broker/messaging.bif.h" +#include "broker/store.bif.h" #include "logging/Manager.h" #include "DebugLogger.h" #include "iosource/Manager.h" diff --git a/src/comm/Manager.h b/src/broker/Manager.h similarity index 99% rename from src/comm/Manager.h rename to src/broker/Manager.h index 5ba85210db..63fbba074a 100644 --- a/src/comm/Manager.h +++ b/src/broker/Manager.h @@ -7,7 +7,7 @@ #include #include #include -#include "comm/Store.h" +#include "broker/Store.h" #include "Reporter.h" #include "iosource/IOSource.h" #include "Val.h" diff --git a/src/comm/Store.cc b/src/broker/Store.cc similarity index 99% rename from src/comm/Store.cc rename to src/broker/Store.cc index fd24ac7b90..f9effa6d9e 100644 --- a/src/comm/Store.cc +++ b/src/broker/Store.cc @@ -1,5 +1,5 @@ #include "Store.h" -#include "comm/Manager.h" +#include "broker/Manager.h" #include #include diff --git a/src/comm/Store.h b/src/broker/Store.h similarity index 98% rename from src/comm/Store.h rename to src/broker/Store.h index e132bf310d..5823e0c3f8 100644 --- a/src/comm/Store.h +++ b/src/broker/Store.h @@ -1,8 +1,8 @@ #ifndef BRO_COMM_STORE_H #define BRO_COMM_STORE_H -#include "comm/store.bif.h" -#include "comm/data.bif.h" +#include "broker/store.bif.h" +#include "broker/data.bif.h" #include "Reporter.h" #include "Type.h" #include "Val.h" diff --git a/src/comm/comm.bif b/src/broker/comm.bif similarity index 99% rename from src/comm/comm.bif rename to src/broker/comm.bif index 2c930ba8a9..721f7c259e 100644 --- a/src/comm/comm.bif +++ b/src/broker/comm.bif @@ -2,7 +2,7 @@ ##! General functions regarding Bro's broker communication mechanisms. %%{ -#include "comm/Manager.h" +#include "broker/Manager.h" %%} module BrokerComm; diff --git a/src/comm/data.bif b/src/broker/data.bif similarity index 99% rename from src/comm/data.bif rename to src/broker/data.bif index 7b2c52cb8c..e34e633e3e 100644 --- a/src/comm/data.bif +++ b/src/broker/data.bif @@ -2,7 +2,7 @@ ##! Functions for inspecting and manipulating broker data. %%{ -#include "comm/Data.h" +#include "broker/Data.h" %%} module BrokerComm; diff --git a/src/comm/messaging.bif b/src/broker/messaging.bif similarity index 99% rename from src/comm/messaging.bif rename to src/broker/messaging.bif index c1d3bfe774..a5e661af02 100644 --- a/src/comm/messaging.bif +++ b/src/broker/messaging.bif @@ -2,7 +2,7 @@ ##! Functions for peering and various messaging patterns (e.g. print/log/event). %%{ -#include "comm/Manager.h" +#include "broker/Manager.h" #include "logging/Manager.h" %%} diff --git a/src/comm/store.bif b/src/broker/store.bif similarity index 99% rename from src/comm/store.bif rename to src/broker/store.bif index 4f6c0570f7..6419034b60 100644 --- a/src/comm/store.bif +++ b/src/broker/store.bif @@ -2,9 +2,9 @@ ##! Functions to interface with broker's distributed data store. %%{ -#include "comm/Manager.h" -#include "comm/Store.h" -#include "comm/Data.h" +#include "broker/Manager.h" +#include "broker/Store.h" +#include "broker/Data.h" #include "Trigger.h" %%} diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc index 63d21a4655..9db43518ed 100644 --- a/src/logging/Manager.cc +++ b/src/logging/Manager.cc @@ -17,7 +17,7 @@ #include "logging.bif.h" #ifdef ENABLE_BROKER -#include "comm/Manager.h" +#include "broker/Manager.h" #endif using namespace logging; diff --git a/src/main.cc b/src/main.cc index d186e67e4b..fb48bdc14a 100644 --- a/src/main.cc +++ b/src/main.cc @@ -64,7 +64,7 @@ extern "C" void OPENSSL_add_all_algorithms_conf(void); #include "3rdparty/sqlite3.h" #ifdef ENABLE_BROKER -#include +#include "broker/Manager.h" #endif Brofiler brofiler; diff --git a/testing/btest/Baseline/comm.clone_store/clone.clone.out b/testing/btest/Baseline/broker.clone_store/clone.clone.out similarity index 100% rename from testing/btest/Baseline/comm.clone_store/clone.clone.out rename to testing/btest/Baseline/broker.clone_store/clone.clone.out diff --git a/testing/btest/Baseline/comm.clone_store/master.master.out b/testing/btest/Baseline/broker.clone_store/master.master.out similarity index 100% rename from testing/btest/Baseline/comm.clone_store/master.master.out rename to testing/btest/Baseline/broker.clone_store/master.master.out diff --git a/testing/btest/Baseline/comm.connection_updates/recv.recv.out b/testing/btest/Baseline/broker.connection_updates/recv.recv.out similarity index 100% rename from testing/btest/Baseline/comm.connection_updates/recv.recv.out rename to testing/btest/Baseline/broker.connection_updates/recv.recv.out diff --git a/testing/btest/Baseline/comm.connection_updates/send.send.out b/testing/btest/Baseline/broker.connection_updates/send.send.out similarity index 100% rename from testing/btest/Baseline/comm.connection_updates/send.send.out rename to testing/btest/Baseline/broker.connection_updates/send.send.out diff --git a/testing/btest/Baseline/comm.data/out b/testing/btest/Baseline/broker.data/out similarity index 100% rename from testing/btest/Baseline/comm.data/out rename to testing/btest/Baseline/broker.data/out diff --git a/testing/btest/Baseline/comm.master_store/master.out b/testing/btest/Baseline/broker.master_store/master.out similarity index 100% rename from testing/btest/Baseline/comm.master_store/master.out rename to testing/btest/Baseline/broker.master_store/master.out diff --git a/testing/btest/Baseline/comm.remote_event/recv.recv.out b/testing/btest/Baseline/broker.remote_event/recv.recv.out similarity index 100% rename from testing/btest/Baseline/comm.remote_event/recv.recv.out rename to testing/btest/Baseline/broker.remote_event/recv.recv.out diff --git a/testing/btest/Baseline/comm.remote_event/send.send.out b/testing/btest/Baseline/broker.remote_event/send.send.out similarity index 100% rename from testing/btest/Baseline/comm.remote_event/send.send.out rename to testing/btest/Baseline/broker.remote_event/send.send.out diff --git a/testing/btest/Baseline/comm.remote_log/recv.recv.out b/testing/btest/Baseline/broker.remote_log/recv.recv.out similarity index 100% rename from testing/btest/Baseline/comm.remote_log/recv.recv.out rename to testing/btest/Baseline/broker.remote_log/recv.recv.out diff --git a/testing/btest/Baseline/comm.remote_log/recv.test.log b/testing/btest/Baseline/broker.remote_log/recv.test.log similarity index 100% rename from testing/btest/Baseline/comm.remote_log/recv.test.log rename to testing/btest/Baseline/broker.remote_log/recv.test.log diff --git a/testing/btest/Baseline/comm.remote_log/send.send.out b/testing/btest/Baseline/broker.remote_log/send.send.out similarity index 100% rename from testing/btest/Baseline/comm.remote_log/send.send.out rename to testing/btest/Baseline/broker.remote_log/send.send.out diff --git a/testing/btest/Baseline/comm.remote_log/send.test.log b/testing/btest/Baseline/broker.remote_log/send.test.log similarity index 100% rename from testing/btest/Baseline/comm.remote_log/send.test.log rename to testing/btest/Baseline/broker.remote_log/send.test.log diff --git a/testing/btest/Baseline/comm.remote_print/recv.recv.out b/testing/btest/Baseline/broker.remote_print/recv.recv.out similarity index 100% rename from testing/btest/Baseline/comm.remote_print/recv.recv.out rename to testing/btest/Baseline/broker.remote_print/recv.recv.out diff --git a/testing/btest/Baseline/comm.remote_print/send.send.out b/testing/btest/Baseline/broker.remote_print/send.send.out similarity index 100% rename from testing/btest/Baseline/comm.remote_print/send.send.out rename to testing/btest/Baseline/broker.remote_print/send.send.out diff --git a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log index 7b144198ee..297cd80996 100644 --- a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log +++ b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log @@ -14,8 +14,8 @@ scripts/base/init-bare.bro build/scripts/base/bif/reporter.bif.bro build/scripts/base/bif/plugins/Bro_SNMP.types.bif.bro build/scripts/base/bif/event.bif.bro - scripts/base/frameworks/comm/__load__.bro - scripts/base/frameworks/comm/main.bro + scripts/base/frameworks/broker/__load__.bro + scripts/base/frameworks/broker/main.bro scripts/base/frameworks/logging/__load__.bro scripts/base/frameworks/logging/main.bro build/scripts/base/bif/logging.bif.bro diff --git a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log index b102ad26a5..e48f67c348 100644 --- a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log +++ b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log @@ -14,8 +14,8 @@ scripts/base/init-bare.bro build/scripts/base/bif/reporter.bif.bro build/scripts/base/bif/plugins/Bro_SNMP.types.bif.bro build/scripts/base/bif/event.bif.bro - scripts/base/frameworks/comm/__load__.bro - scripts/base/frameworks/comm/main.bro + scripts/base/frameworks/broker/__load__.bro + scripts/base/frameworks/broker/main.bro scripts/base/frameworks/logging/__load__.bro scripts/base/frameworks/logging/main.bro build/scripts/base/bif/logging.bif.bro diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_connecting-connector_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_connecting-connector_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_connecting-connector_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_connecting-connector_bro/output diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_connecting-listener_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_connecting-listener_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_connecting-listener_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_connecting-listener_bro/output diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_events-connector_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_events-connector_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_events-connector_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_events-connector_bro/output diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_events-listener_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_events-listener_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_events-listener_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_events-listener_bro/output diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_logs-connector_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_logs-connector_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_logs-connector_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_logs-connector_bro/output diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_logs-listener_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_logs-listener_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_logs-listener_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_logs-listener_bro/output diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_printing-connector_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_printing-connector_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_printing-connector_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_printing-connector_bro/output diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_printing-listener_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_printing-listener_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_printing-listener_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_printing-listener_bro/output diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_stores-connector_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_stores-connector_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_stores-connector_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_stores-connector_bro/output diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_stores-listener_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_stores-listener_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_stores-listener_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_stores-listener_bro/output diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_testlog_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_testlog_bro/output similarity index 100% rename from testing/btest/Baseline/doc.sphinx.include-doc_frameworks_comm_testlog_bro/output rename to testing/btest/Baseline/doc.sphinx.include-doc_frameworks_broker_testlog_bro/output diff --git a/testing/btest/Baseline/plugins.hooks/output b/testing/btest/Baseline/plugins.hooks/output index 7c2f35b641..6956f013bc 100644 --- a/testing/btest/Baseline/plugins.hooks/output +++ b/testing/btest/Baseline/plugins.hooks/output @@ -192,7 +192,7 @@ 0.000000 MetaHookPost CallFunction(Log::__create_stream, , (Weird::LOG, [columns=, ev=Weird::log_weird])) -> 0.000000 MetaHookPost CallFunction(Log::__create_stream, , (X509::LOG, [columns=, ev=X509::log_x509])) -> 0.000000 MetaHookPost CallFunction(Log::__create_stream, , (mysql::LOG, [columns=, ev=MySQL::log_mysql])) -> -0.000000 MetaHookPost CallFunction(Log::__write, , (PacketFilter::LOG, [ts=1425348860.085231, node=bro, filter=ip or not ip, init=T, success=T])) -> +0.000000 MetaHookPost CallFunction(Log::__write, , (PacketFilter::LOG, [ts=1425596289.27327, node=bro, filter=ip or not ip, init=T, success=T])) -> 0.000000 MetaHookPost CallFunction(Log::add_default_filter, , (Cluster::LOG)) -> 0.000000 MetaHookPost CallFunction(Log::add_default_filter, , (Communication::LOG)) -> 0.000000 MetaHookPost CallFunction(Log::add_default_filter, , (Conn::LOG)) -> @@ -286,8 +286,8 @@ 0.000000 MetaHookPost CallFunction(Log::create_stream, , (Weird::LOG, [columns=, ev=Weird::log_weird])) -> 0.000000 MetaHookPost CallFunction(Log::create_stream, , (X509::LOG, [columns=, ev=X509::log_x509])) -> 0.000000 MetaHookPost CallFunction(Log::create_stream, , (mysql::LOG, [columns=, ev=MySQL::log_mysql])) -> -0.000000 MetaHookPost CallFunction(Log::default_path_func, , (PacketFilter::LOG, , [ts=1425348860.085231, node=bro, filter=ip or not ip, init=T, success=T])) -> -0.000000 MetaHookPost CallFunction(Log::write, , (PacketFilter::LOG, [ts=1425348860.085231, node=bro, filter=ip or not ip, init=T, success=T])) -> +0.000000 MetaHookPost CallFunction(Log::default_path_func, , (PacketFilter::LOG, , [ts=1425596289.27327, node=bro, filter=ip or not ip, init=T, success=T])) -> +0.000000 MetaHookPost CallFunction(Log::write, , (PacketFilter::LOG, [ts=1425596289.27327, node=bro, filter=ip or not ip, init=T, success=T])) -> 0.000000 MetaHookPost CallFunction(Notice::want_pp, , ()) -> 0.000000 MetaHookPost CallFunction(PacketFilter::build, , ()) -> 0.000000 MetaHookPost CallFunction(PacketFilter::combine_filters, , (ip or not ip, and, )) -> @@ -478,8 +478,8 @@ 0.000000 MetaHookPost LoadFile(base<...>/analyzer) -> -1 0.000000 MetaHookPost LoadFile(base<...>/analyzer.bif) -> -1 0.000000 MetaHookPost LoadFile(base<...>/bro.bif) -> -1 +0.000000 MetaHookPost LoadFile(base<...>/broker) -> -1 0.000000 MetaHookPost LoadFile(base<...>/cluster) -> -1 -0.000000 MetaHookPost LoadFile(base<...>/comm) -> -1 0.000000 MetaHookPost LoadFile(base<...>/communication) -> -1 0.000000 MetaHookPost LoadFile(base<...>/conn) -> -1 0.000000 MetaHookPost LoadFile(base<...>/conn-ids) -> -1 @@ -737,7 +737,7 @@ 0.000000 MetaHookPre CallFunction(Log::__create_stream, , (Weird::LOG, [columns=, ev=Weird::log_weird])) 0.000000 MetaHookPre CallFunction(Log::__create_stream, , (X509::LOG, [columns=, ev=X509::log_x509])) 0.000000 MetaHookPre CallFunction(Log::__create_stream, , (mysql::LOG, [columns=, ev=MySQL::log_mysql])) -0.000000 MetaHookPre CallFunction(Log::__write, , (PacketFilter::LOG, [ts=1425348860.085231, node=bro, filter=ip or not ip, init=T, success=T])) +0.000000 MetaHookPre CallFunction(Log::__write, , (PacketFilter::LOG, [ts=1425596289.27327, node=bro, filter=ip or not ip, init=T, success=T])) 0.000000 MetaHookPre CallFunction(Log::add_default_filter, , (Cluster::LOG)) 0.000000 MetaHookPre CallFunction(Log::add_default_filter, , (Communication::LOG)) 0.000000 MetaHookPre CallFunction(Log::add_default_filter, , (Conn::LOG)) @@ -831,8 +831,8 @@ 0.000000 MetaHookPre CallFunction(Log::create_stream, , (Weird::LOG, [columns=, ev=Weird::log_weird])) 0.000000 MetaHookPre CallFunction(Log::create_stream, , (X509::LOG, [columns=, ev=X509::log_x509])) 0.000000 MetaHookPre CallFunction(Log::create_stream, , (mysql::LOG, [columns=, ev=MySQL::log_mysql])) -0.000000 MetaHookPre CallFunction(Log::default_path_func, , (PacketFilter::LOG, , [ts=1425348860.085231, node=bro, filter=ip or not ip, init=T, success=T])) -0.000000 MetaHookPre CallFunction(Log::write, , (PacketFilter::LOG, [ts=1425348860.085231, node=bro, filter=ip or not ip, init=T, success=T])) +0.000000 MetaHookPre CallFunction(Log::default_path_func, , (PacketFilter::LOG, , [ts=1425596289.27327, node=bro, filter=ip or not ip, init=T, success=T])) +0.000000 MetaHookPre CallFunction(Log::write, , (PacketFilter::LOG, [ts=1425596289.27327, node=bro, filter=ip or not ip, init=T, success=T])) 0.000000 MetaHookPre CallFunction(Notice::want_pp, , ()) 0.000000 MetaHookPre CallFunction(PacketFilter::build, , ()) 0.000000 MetaHookPre CallFunction(PacketFilter::combine_filters, , (ip or not ip, and, )) @@ -1023,8 +1023,8 @@ 0.000000 MetaHookPre LoadFile(base<...>/analyzer) 0.000000 MetaHookPre LoadFile(base<...>/analyzer.bif) 0.000000 MetaHookPre LoadFile(base<...>/bro.bif) +0.000000 MetaHookPre LoadFile(base<...>/broker) 0.000000 MetaHookPre LoadFile(base<...>/cluster) -0.000000 MetaHookPre LoadFile(base<...>/comm) 0.000000 MetaHookPre LoadFile(base<...>/communication) 0.000000 MetaHookPre LoadFile(base<...>/conn) 0.000000 MetaHookPre LoadFile(base<...>/conn-ids) @@ -1281,7 +1281,7 @@ 0.000000 | HookCallFunction Log::__create_stream(Weird::LOG, [columns=, ev=Weird::log_weird]) 0.000000 | HookCallFunction Log::__create_stream(X509::LOG, [columns=, ev=X509::log_x509]) 0.000000 | HookCallFunction Log::__create_stream(mysql::LOG, [columns=, ev=MySQL::log_mysql]) -0.000000 | HookCallFunction Log::__write(PacketFilter::LOG, [ts=1425348860.085231, node=bro, filter=ip or not ip, init=T, success=T]) +0.000000 | HookCallFunction Log::__write(PacketFilter::LOG, [ts=1425596289.27327, node=bro, filter=ip or not ip, init=T, success=T]) 0.000000 | HookCallFunction Log::add_default_filter(Cluster::LOG) 0.000000 | HookCallFunction Log::add_default_filter(Communication::LOG) 0.000000 | HookCallFunction Log::add_default_filter(Conn::LOG) @@ -1375,8 +1375,8 @@ 0.000000 | HookCallFunction Log::create_stream(Weird::LOG, [columns=, ev=Weird::log_weird]) 0.000000 | HookCallFunction Log::create_stream(X509::LOG, [columns=, ev=X509::log_x509]) 0.000000 | HookCallFunction Log::create_stream(mysql::LOG, [columns=, ev=MySQL::log_mysql]) -0.000000 | HookCallFunction Log::default_path_func(PacketFilter::LOG, , [ts=1425348860.085231, node=bro, filter=ip or not ip, init=T, success=T]) -0.000000 | HookCallFunction Log::write(PacketFilter::LOG, [ts=1425348860.085231, node=bro, filter=ip or not ip, init=T, success=T]) +0.000000 | HookCallFunction Log::default_path_func(PacketFilter::LOG, , [ts=1425596289.27327, node=bro, filter=ip or not ip, init=T, success=T]) +0.000000 | HookCallFunction Log::write(PacketFilter::LOG, [ts=1425596289.27327, node=bro, filter=ip or not ip, init=T, success=T]) 0.000000 | HookCallFunction Notice::want_pp() 0.000000 | HookCallFunction PacketFilter::build() 0.000000 | HookCallFunction PacketFilter::combine_filters(ip or not ip, and, ) diff --git a/testing/btest/comm/clone_store.bro b/testing/btest/broker/clone_store.bro similarity index 100% rename from testing/btest/comm/clone_store.bro rename to testing/btest/broker/clone_store.bro diff --git a/testing/btest/comm/connection_updates.bro b/testing/btest/broker/connection_updates.bro similarity index 100% rename from testing/btest/comm/connection_updates.bro rename to testing/btest/broker/connection_updates.bro diff --git a/testing/btest/comm/data.bro b/testing/btest/broker/data.bro similarity index 100% rename from testing/btest/comm/data.bro rename to testing/btest/broker/data.bro diff --git a/testing/btest/comm/master_store.bro b/testing/btest/broker/master_store.bro similarity index 100% rename from testing/btest/comm/master_store.bro rename to testing/btest/broker/master_store.bro diff --git a/testing/btest/comm/remote_event.test b/testing/btest/broker/remote_event.test similarity index 100% rename from testing/btest/comm/remote_event.test rename to testing/btest/broker/remote_event.test diff --git a/testing/btest/comm/remote_log.test b/testing/btest/broker/remote_log.test similarity index 100% rename from testing/btest/comm/remote_log.test rename to testing/btest/broker/remote_log.test diff --git a/testing/btest/comm/remote_print.test b/testing/btest/broker/remote_print.test similarity index 100% rename from testing/btest/comm/remote_print.test rename to testing/btest/broker/remote_print.test diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg index 3c91872f5a..0fa862a2dc 100644 --- a/testing/btest/btest.cfg +++ b/testing/btest/btest.cfg @@ -1,5 +1,5 @@ [btest] -TestDirs = doc bifs language core scripts istate coverage signatures plugins comm +TestDirs = doc bifs language core scripts istate coverage signatures plugins broker TmpDir = %(testbase)s/.tmp BaselineDir = %(testbase)s/Baseline IgnoreDirs = .svn CVS .tmp diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_connecting-connector_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_connecting-connector_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_connecting-connector_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_connecting-connector_bro.btest diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_connecting-listener_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_connecting-listener_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_connecting-listener_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_connecting-listener_bro.btest diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_events-connector_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_events-connector_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_events-connector_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_events-connector_bro.btest diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_events-listener_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_events-listener_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_events-listener_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_events-listener_bro.btest diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_logs-connector_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_logs-connector_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_logs-connector_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_logs-connector_bro.btest diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_logs-listener_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_logs-listener_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_logs-listener_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_logs-listener_bro.btest diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_printing-connector_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_printing-connector_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_printing-connector_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_printing-connector_bro.btest diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_printing-listener_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_printing-listener_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_printing-listener_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_printing-listener_bro.btest diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_stores-connector_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_stores-connector_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_stores-connector_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_stores-connector_bro.btest diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_stores-listener_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_stores-listener_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_stores-listener_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_stores-listener_bro.btest diff --git a/testing/btest/doc/sphinx/include-doc_frameworks_comm_testlog_bro.btest b/testing/btest/doc/sphinx/include-doc_frameworks_broker_testlog_bro.btest similarity index 100% rename from testing/btest/doc/sphinx/include-doc_frameworks_comm_testlog_bro.btest rename to testing/btest/doc/sphinx/include-doc_frameworks_broker_testlog_bro.btest