Fixed a couple of crashes with the new networking release

• Fixed a crash where suspending the OnionRequestRouter wouldn't join threads it was closing
• Attempt to fix a crash where shutting down may not wait for the loop to reset properly

Author: mpretty-cyro

CMakeLists.txt

@@ -17,7 +17,7 @@ if(CCACHE_PROGRAM)
 endif()
 
 project(libsession-util
-    VERSION 1.6.1
+    VERSION 1.6.2
     DESCRIPTION "Session client utility library"
     LANGUAGES ${LANGS})
 

src/network/routing/onion_request_router.cpp

@@ -343,23 +343,9 @@ OnionRequestRouter::OnionRequestRouter(
 }
 
 OnionRequestRouter::~OnionRequestRouter() {
-    std::vector<std::thread> threads_to_join;
-
     // Use 'call_get' to force this to be synchronous
     if (_loop)
-        _loop->call_get([this, &threads_to_join] {
-            // Harvest upload thread handles *before* _close_connections clears the map
-            for (auto& [_, upload] : _active_uploads)
-                if (upload.second.joinable())
-                    threads_to_join.push_back(std::move(upload.second));
-
-            _close_connections();
-        });
-
-    // Block until upload threads have finished
-    for (auto& t : threads_to_join)
-        if (t.joinable())
-            t.join();
+        _loop->call_get([this] { _close_connections(); });
 
     log::debug(cat, "Destroyed.");
 }
@@ -662,8 +648,13 @@ void OnionRequestRouter::_pre_build_paths_if_needed() {
 }
 
 void OnionRequestRouter::_close_connections() {
+    std::vector<std::thread> threads_to_join;
+
     // Cancel any uploads and downloads
     for (auto& [id, request_and_thread] : _active_uploads) {
+        if (request_and_thread.second.joinable())
+            threads_to_join.push_back(std::move(request_and_thread.second));
+
         request_and_thread.first.cancel();
 
         if (request_and_thread.first.on_complete)
@@ -720,6 +711,12 @@ void OnionRequestRouter::_close_connections() {
     _path_rotation_schedule.clear();
     _pending_rotation_paths.clear();
     _update_status();
+
+    // Block until upload threads have finished
+    for (auto& t : threads_to_join)
+        if (t.joinable())
+            t.join();
+
     log::info(cat, "Closed all connections.");
 }
 

src/network/session_network.cpp

@@ -260,6 +260,17 @@ Network::~Network() {
 
         _update_status(ConnectionStatus::disconnected);
     });
+
+    // Explicitly destroy in dependency order while _loop is still alive. Their destructors post
+    // final cleanup via call_get so the loop must be running when they destruct.
+    _router.reset();
+    _snode_pool.reset();
+    _transport.reset();
+
+    // Now shut down the loops (these destructors join their threads)
+    _disk_loop.reset();
+    _loop.reset();
+
     log::debug(cat, "Destroyed.");
 }