From 4c37fa33d50edf839041edf762945c3ad1f92edc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sat, 5 Dec 2020 11:18:43 -0500
Subject: [PATCH] connectionmanager: cleanup
Change-Id: Ifc65f6c562fa0f41c48283621b1f7d0241d09d84
---
src/jamidht/connectionmanager.cpp | 10 ++--------
src/sip/sipaccount.cpp | 1 -
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/jamidht/connectionmanager.cpp b/src/jamidht/connectionmanager.cpp
index d8d7f14645..6215afb4b0 100644
--- a/src/jamidht/connectionmanager.cpp
+++ b/src/jamidht/connectionmanager.cpp
@@ -687,13 +687,6 @@ ConnectionManager::Impl::onDhtPeerRequest(const PeerConnectionRequest& req,
}
// Because the connection is accepted, create an ICE socket.
- auto& iceTransportFactory = Manager::instance().getIceTransportFactory();
- struct IceReady
- {
- std::mutex mtx {};
- std::condition_variable cv {};
- bool ready {false};
- };
auto ice_config = account.getIceOptions();
ice_config.tcpEnable = true;
ice_config.onInitDone = [w = weak(), req](bool ok) {
@@ -739,7 +732,8 @@ ConnectionManager::Impl::onDhtPeerRequest(const PeerConnectionRequest& req,
infos_[{req.from, req.id}] = info;
}
std::unique_lock<std::mutex> lk {info->mutex_};
- info->ice_ = iceTransportFactory.createUTransport(account.getAccountID().c_str(),
+ info->ice_ = Manager::instance()
+ .getIceTransportFactory().createUTransport(account.getAccountID().c_str(),
1,
true,
ice_config);
diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp
index b9e48fdd6e..7d9298b7f4 100644
--- a/src/sip/sipaccount.cpp
+++ b/src/sip/sipaccount.cpp
@@ -1605,7 +1605,6 @@ SIPAccount::getHostPortFromSTUN(pj_pool_t* pool)
emitSignal<DRing::ConfigurationSignal::StunStatusFailed>(getAccountID());
pjsip_host_port result;
pj_strdup2(pool, &result.host, addr.c_str());
- result.host.slen = addr.length();
result.port = port;
return result;
}
--
GitLab