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

Reorganize private broker/Manager members

Browse source
This commit is contained in:
Jon Siwek 2018-06-25 16:34:54 -05:00
parent 0200b5bd88
commit a33d2d13bf
4 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
2.5-687 | 2018-06-25 16:35:25 -0500
* Reorganize internal + private broker/Manager.h bits (Corelight)
* Reduce proliferation of including broker header files (Corelight)
2.5-684 | 2018-06-25 11:26:55 -0500 2.5-684 | 2018-06-25 11:26:55 -0500
* Use docker containers to run Bro tests on Travis CI (Daniel Thayer) * Use docker containers to run Bro tests on Travis CI (Daniel Thayer)

2
VERSION
View file

@ -1 +1 @@
2.5-684 2.5-687

12
src/broker/Manager.cc
View file

@ -73,9 +73,6 @@ public:
const broker::endpoint_info Manager::NoPeer{{}, {}}; const broker::endpoint_info Manager::NoPeer{{}, {}};
VectorType* Manager::vector_of_data_type;
EnumType* Manager::log_id_type;
EnumType* Manager::writer_id_type;
int Manager::script_scope = 0; int Manager::script_scope = 0;
struct unref_guard { struct unref_guard {
@ -140,14 +137,17 @@ static std::string RenderMessage(const broker::error& e)
#endif #endif
Manager::Manager(bool reading_pcaps) Manager::Manager(bool arg_reading_pcaps)
{ {
bound_port = 0; bound_port = 0;
reading_pcaps = arg_reading_pcaps;
peer_count = 0; peer_count = 0;
log_topic_func = nullptr;
vector_of_data_type = nullptr;
log_id_type = nullptr;
writer_id_type = nullptr;
next_timestamp = 1;
SetIdle(false); SetIdle(false);
this->reading_pcaps = reading_pcaps;
} }
Manager::~Manager() Manager::~Manager()

27
src/broker/Manager.h
View file

@ -371,12 +371,6 @@ private:
const char* Tag() override const char* Tag() override
{ return "Broker::Manager"; } { return "Broker::Manager"; }
Func* log_topic_func;
std::string default_log_topic_prefix;
uint16_t bound_port;
std::shared_ptr<BrokerState> bstate;
struct LogBuffer { struct LogBuffer {
// Indexed by topic string. // Indexed by topic string.
std::unordered_map<std::string, broker::vector> msgs; std::unordered_map<std::string, broker::vector> msgs;
@ -386,9 +380,6 @@ private:
size_t Flush(broker::endpoint& endpoint); size_t Flush(broker::endpoint& endpoint);
}; };
// Indexed by stream ID enum.
std::vector<LogBuffer> log_buffers;
// Data stores // Data stores
using query_id = std::pair<broker::request_id, StoreHandleVal*>; using query_id = std::pair<broker::request_id, StoreHandleVal*>;
@ -402,19 +393,25 @@ private:
} }
}; };
std::vector<LogBuffer> log_buffers; // Indexed by stream ID enum.
std::string default_log_topic_prefix;
std::shared_ptr<BrokerState> bstate;
std::unordered_map<std::string, StoreHandleVal*> data_stores; std::unordered_map<std::string, StoreHandleVal*> data_stores;
std::unordered_map<query_id, StoreQueryCallback*, query_id_hasher> pending_queries; std::unordered_map<query_id, StoreQueryCallback*,
query_id_hasher> pending_queries;
Stats statistics; Stats statistics;
double next_timestamp;
uint16_t bound_port;
bool reading_pcaps; bool reading_pcaps;
int peer_count; int peer_count;
static int script_scope; Func* log_topic_func;
VectorType* vector_of_data_type;
EnumType* log_id_type;
EnumType* writer_id_type;
static VectorType* vector_of_data_type; static int script_scope;
static EnumType* log_id_type;
static EnumType* writer_id_type;
}; };
} // namespace bro_broker } // namespace bro_broker