commit 4cda2d71560302955ea5e9243f61378edb3772ed
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Thu Jun 01 15:44:43 2023 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Thu Jun 01 15:44:53 2023 -0400
tree b3a33c6f549be6585e97c19fb1a5637413170837
parent 6e56764d83004c6e5c40b05cfd85840ce09c6448

connectionmanager: catch exception if initIceInstance throws

backport from 6c7042e1338fa62c7f45018e489e7d3781ede79a in jami-daemon

Change-Id: I0dd69d7908137e3715d6a9158b5a0c4975b7748a

src/connectionmanager.cpp

diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp
index 96bd6ba..e4453f0 100644
--- a/src/connectionmanager.cpp
+++ b/src/connectionmanager.cpp
@@ -756,7 +756,13 @@
             info->ice_->setOnShutdown([eraseInfo]() {
                 dht::ThreadPool::io().run([eraseInfo = std::move(eraseInfo)] { eraseInfo(); });
             });
-            info->ice_->initIceInstance(ice_config);
+            try {
+                info->ice_->initIceInstance(ice_config);
+            } catch (const std::exception& e) {
+                if (sthis->config_->logger)
+                    sthis->config_->logger->error("{}", e.what());
+                dht::ThreadPool::io().run([eraseInfo = std::move(eraseInfo)] { eraseInfo(); });
+            }
         });
     });
 }
@@ -1152,7 +1158,13 @@
         info->ice_->setOnShutdown([eraseInfo]() {
             dht::ThreadPool::io().run([eraseInfo = std::move(eraseInfo)] { eraseInfo(); });
         });
-        info->ice_->initIceInstance(ice_config);
+        try {
+            info->ice_->initIceInstance(ice_config);
+        } catch (const std::exception& e) {
+            if (shared->config_->logger)
+                shared->config_->logger->error("{}", e.what());
+            dht::ThreadPool::io().run([eraseInfo = std::move(eraseInfo)] { eraseInfo(); });
+        }
     });
 }