jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

[#2519] Do not store STUN or TLS transport in map

Browse Source
This commit is contained in:
Alexandre Savard
2009-12-17 10:27:22 -05:00
parent 228bf3a3d3
commit 0cbaa83a46
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sflphone-common/src/sip/sipvoiplink.cpp
View File

@ -2066,9 +2066,11 @@ bool SIPVoIPLink::createSipTransport(AccountID id) {
if (status != PJ_SUCCESS) {
_debug ("Failed to initialize TLS transport for account %s\n", id.c_str());
return false;
}
}
else {
// Launch a new UDP listener/transport, using the published address
if (account->isStunEnabled ()) {
@ -2077,7 +2079,9 @@ bool SIPVoIPLink::createSipTransport(AccountID id) {
if (status != PJ_SUCCESS) {
_debug ("Failed to initialize UDP transport with an extern published address for account %s\n", id.c_str());
return false;
}
} else {
_debug ("Create UDP transport\n");
@ -2085,32 +2089,26 @@ bool SIPVoIPLink::createSipTransport(AccountID id) {
if (status != PJ_SUCCESS) {
_debug ("Failed to initialize UDP transport for account %s\n", id.c_str());
return false;
}
else {
// If transport succesfully created, store it in the internal map.
// STUN aware transport are account specific and should not be stored in map.
// TLS transport is ephemeral and is managed by PJSIP, should not be stored either.
addTransportToMap(account->getTransportMapKey(), account->getAccountTransport());
}
// We should not bind account to local udp transport here since we must
/*
if (status != PJ_SUCCESS) {
_debug ("Use the local UDP transport\n");
account->setAccountTransport (_localUDPTransport);
}
*/
}
}
}
// If Transport created succesfully, store it in the internal map
// If stun is enabled, do not store it due to stun per account policy
if((status == PJ_SUCCESS) && !account->isStunEnabled()) {
return true;
addTransportToMap(account->getTransportMapKey(), account->getAccountTransport());
return true;
}
else {
return false;
}
}
bool SIPVoIPLink::addTransportToMap(std::string key, pjsip_transport* transport)