Skip to content
Snippets Groups Projects
Commit 4cda2d71 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

connectionmanager: catch exception if initIceInstance throws

backport from 6c7042e1338fa62c7f45018e489e7d3781ede79a in jami-daemon

Change-Id: I0dd69d7908137e3715d6a9158b5a0c4975b7748a
parent 6e56764d
Branches
No related tags found
No related merge requests found
...@@ -756,7 +756,13 @@ ConnectionManager::Impl::connectDevice(const std::shared_ptr<dht::crypto::Certif ...@@ -756,7 +756,13 @@ ConnectionManager::Impl::connectDevice(const std::shared_ptr<dht::crypto::Certif
info->ice_->setOnShutdown([eraseInfo]() { info->ice_->setOnShutdown([eraseInfo]() {
dht::ThreadPool::io().run([eraseInfo = std::move(eraseInfo)] { eraseInfo(); }); dht::ThreadPool::io().run([eraseInfo = std::move(eraseInfo)] { eraseInfo(); });
}); });
try {
info->ice_->initIceInstance(ice_config); 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 @@ ConnectionManager::Impl::onDhtPeerRequest(const PeerConnectionRequest& req, ...@@ -1152,7 +1158,13 @@ ConnectionManager::Impl::onDhtPeerRequest(const PeerConnectionRequest& req,
info->ice_->setOnShutdown([eraseInfo]() { info->ice_->setOnShutdown([eraseInfo]() {
dht::ThreadPool::io().run([eraseInfo = std::move(eraseInfo)] { eraseInfo(); }); dht::ThreadPool::io().run([eraseInfo = std::move(eraseInfo)] { eraseInfo(); });
}); });
try {
info->ice_->initIceInstance(ice_config); 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(); });
}
}); });
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment