From 0cbaa83a46f00c5e1edadcfd25da17c089093a12 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@alexandresavard-desktop.(none)>
Date: Thu, 17 Dec 2009 10:27:22 -0500
Subject: [PATCH] [#2519] Do not store STUN or TLS transport in map

---
 sflphone-common/src/sip/sipvoiplink.cpp | 38 ++++++++++++-------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index dde7a25d6..de9edbb29 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -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)