diff --git a/src/RunState.cc b/src/RunState.cc index 1074100fa6..5111ec350f 100644 --- a/src/RunState.cc +++ b/src/RunState.cc @@ -385,7 +385,7 @@ void finish_run(int drain_events) { event_mgr.Drain(); if ( session_mgr ) - session_mgr->Done(); + session_mgr->Clear(); } #ifdef DEBUG diff --git a/src/fuzzers/fuzzer-setup.h b/src/fuzzers/fuzzer-setup.h index b61f6db99d..3c2d20f18f 100644 --- a/src/fuzzers/fuzzer-setup.h +++ b/src/fuzzers/fuzzer-setup.h @@ -88,7 +88,7 @@ void fuzzer_cleanup_one_input() { zeek::event_mgr.Drain(); zeek::session_mgr->Drain(); zeek::event_mgr.Drain(); - zeek::session_mgr->Done(); + zeek::session_mgr->Clear(); run_state::terminating = false; } diff --git a/src/session/Manager.cc b/src/session/Manager.cc index 82c61b108a..5e57ac5163 100644 --- a/src/session/Manager.cc +++ b/src/session/Manager.cc @@ -82,9 +82,10 @@ Manager::Manager() { }); } -Manager::~Manager() { delete stats; } - -void Manager::Done() { Clear(); } +Manager::~Manager() { + Clear(); + delete stats; +} Connection* Manager::FindConnection(Val* v) { zeek::detail::ConnKey conn_key(v); diff --git a/src/session/Manager.h b/src/session/Manager.h index eb02e87498..007cd5d31c 100644 --- a/src/session/Manager.h +++ b/src/session/Manager.h @@ -59,7 +59,8 @@ public: Manager(); ~Manager(); - void Done(); // call to drain events before destructing + [[deprecated("Remove in v8.1 - no functionality. Use Drain() and Clear().")]] + void Done() {}; // Looks up the connection referred to by the given Val, // which should be a conn_id record. Returns nil if there's