[#4243] Implement initLocalCryptoInfo to be called at different momment

sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp

@@ -135,10 +135,6 @@ void AudioRtpFactory::initAudioRtpSession (SIPCall * ca)
 
                 _rtpSession = new AudioSrtpSession (&Manager::instance(), ca);
                 _rtpSessionType = Sdes;
-
-                static_cast<AudioSrtpSession *> (_rtpSession)->initLocalCryptoInfo ();
-
-                ca->getLocalSDP()->set_srtp_crypto (static_cast<AudioSrtpSession *> (_rtpSession)->getLocalCryptoInfo());
                 break;
 
             default:
@@ -262,10 +258,12 @@ sfl::AudioZrtpSession * AudioRtpFactory::getAudioZrtpSession()
     }
 }
 
-void sfl::AudioRtpFactory::initLocalCryptoInfo ()
+void sfl::AudioRtpFactory::initLocalCryptoInfo (SIPCall * ca)
 {
     if (_rtpSession && _rtpSessionType && (_rtpSessionType == Sdes)) {
         static_cast<AudioSrtpSession *> (_rtpSession)->initLocalCryptoInfo ();
+
+        ca->getLocalSDP()->set_srtp_crypto (static_cast<AudioSrtpSession *> (_rtpSession)->getLocalCryptoInfo());
     }
 }
 

sflphone-common/src/audio/audiortp/AudioRtpFactory.h

@@ -166,7 +166,7 @@ class AudioRtpFactory
          */
         sfl::AudioZrtpSession * getAudioZrtpSession();
 
-        void initLocalCryptoInfo (void);
+        void initLocalCryptoInfo (SIPCall *ca);
 
         /**
          * Set remote cryptographic info. Should be called after negotiation in SDP

sflphone-common/src/sip/sipvoiplink.cpp

@@ -820,6 +820,7 @@ SIPVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl)
             _info ("UserAgent: Creating new rtp session");
             call->getAudioRtp()->initAudioRtpConfig (call);
             call->getAudioRtp()->initAudioRtpSession (call);
+            call->getAudioRtp()->initLocalCryptoInfo (call);
         } catch (...) {
             _error ("UserAgent: Error: Failed to create rtp thread from newOutGoingCall");
         }
@@ -1737,6 +1738,7 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
         try {
             call->getAudioRtp()->initAudioRtpConfig (call);
             call->getAudioRtp()->initAudioRtpSession (call);
+            call->getAudioRtp()->initLocalCryptoInfo (call);
         } catch (...) {
             _debug ("UserAgent: Unable to create RTP Session in new IP2IP call (%s:%d)", __FILE__, __LINE__);
         }
@@ -3363,6 +3365,7 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
 
             try {
                 call->getAudioRtp()->setRemoteCryptoInfo (sdesnego);
+                call->getAudioRtp()->initLocalCryptoInfo (call);
             } catch (...) {}
 
             DBusManager::instance().getCallManager()->secureSdesOn (call->getCallId());