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

connectionmanager: cleanup

Change-Id: Ifc65f6c562fa0f41c48283621b1f7d0241d09d84
parent 8009457f
Branches
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment