low-level naming tweaks / comments / const-ified accessor

This commit is contained in:
Vern Paxson 2022-02-08 16:59:58 -08:00 committed by Christian Kreibich
parent 095ab178f3
commit 475063804e
3 changed files with 8 additions and 6 deletions

View file

@ -20,7 +20,7 @@ class EventHandler
public: public:
explicit EventHandler(std::string name); explicit EventHandler(std::string name);
const char* Name() { return name.data(); } const char* Name() const { return name.data(); }
const FuncPtr& GetFunc() { return local; } const FuncPtr& GetFunc() { return local; }

View file

@ -605,6 +605,8 @@ public:
* use this method to attach additional data to the connections. A * use this method to attach additional data to the connections. A
* call to BuildConnVal() will in turn trigger a call to * call to BuildConnVal() will in turn trigger a call to
* UpdateConnVal(). * UpdateConnVal().
* ### The above comment needs updating, there's no BuildConnVal()
* ### anymore -VP
* *
* @param conn_val The connenction value being updated. * @param conn_val The connenction value being updated.
*/ */

View file

@ -281,13 +281,13 @@ static void done_with_network()
ZEEK_LSAN_DISABLE(); ZEEK_LSAN_DISABLE();
} }
static void terminate_bro() static void terminate_zeek()
{ {
util::detail::set_processing_status("TERMINATING", "terminate_bro"); util::detail::set_processing_status("TERMINATING", "terminate_zeek");
run_state::terminating = true; run_state::terminating = true;
iosource_mgr->Wakeup("terminate_bro"); iosource_mgr->Wakeup("terminate_zeek");
// File analysis termination may produce events, so do it early on in // File analysis termination may produce events, so do it early on in
// the termination process. // the termination process.
@ -943,7 +943,7 @@ int cleanup(bool did_run_loop)
done_with_network(); done_with_network();
run_state::detail::delete_run(); run_state::detail::delete_run();
terminate_bro(); terminate_zeek();
sqlite3_shutdown(); sqlite3_shutdown();
@ -974,7 +974,7 @@ void zeek_terminate_loop(const char* reason)
zeek::detail::done_with_network(); zeek::detail::done_with_network();
delete_run(); delete_run();
zeek::detail::terminate_bro(); zeek::detail::terminate_zeek();
// Close files after net_delete(), because net_delete() // Close files after net_delete(), because net_delete()
// might write to connection content files. // might write to connection content files.