Merge branch 'conference'

sflphone-common/src/sip/sipaccount.cpp

@@ -245,6 +245,11 @@ void SIPAccount::initTlsConfiguration (void)
     /*
      * Initialize structure to zero
      */
+    if(_tlsSetting){
+	free (_tlsSetting);
+	_tlsSetting = NULL;
+    } 
+
     _tlsSetting = (pjsip_tls_setting *) malloc (sizeof (pjsip_tls_setting));
 
     assert (_tlsSetting);
@@ -337,7 +342,18 @@ void SIPAccount::loadConfig()
 
     _publishedIpAddress = Manager::instance().getConfigString (_accountID, PUBLISHED_ADDRESS);
 
+    // Init TLS settings if the user wants to use TLS
+    bool tlsEnabled = Manager::instance().getConfigBool (_accountID, TLS_ENABLE);
+
+    if (tlsEnabled) {
+	_debug("---------------------------- TLS Enabled\n");
+	initTlsConfiguration();
+	_transportType = PJSIP_TRANSPORT_TLS;
+    }
+    else
+    {
 	_transportType = PJSIP_TRANSPORT_UDP;
+    }
 
     // Account generic
     Account::loadConfig();