[#1722] Added setRemoteCryptoInfo function in AudioSrtpSession/AudioRtpFactory

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

@@ -110,7 +110,7 @@ void AudioRtpFactory::initAudioRtpSession (SIPCall * ca)
 	        _rtpSession = new AudioSrtpSession (&Manager::instance(), ca);
                 _rtpSessionType = Sdes;
 
-		ca->getLocalSDP()->set_srtp_crypto(static_cast<AudioSrtpSession *> (_rtpSession)->getCryptoSdpInfo());
+		ca->getLocalSDP()->set_srtp_crypto(static_cast<AudioSrtpSession *> (_rtpSession)->getLocalCryptoInfo());
 		break;
 
             default:
@@ -197,4 +197,16 @@ sfl::AudioZrtpSession * AudioRtpFactory::getAudioZrtpSession()
         throw AudioRtpFactoryException();
     }
 }
+
+void AudioRtpFactory::setRemoteCryptoInfo()
+{
+    if ( (_rtpSessionType != NULL) && (_rtpSessionType != Sdes)) {
+        static_cast<AudioSrtpSession *> (_rtpSession)->setRemoteCryptoInfo();
+    }
+    else {
+        throw AudioRtpFactoryException();
     }
+}
+}
+
+

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

@@ -93,6 +93,12 @@ namespace sfl {
          */
         sfl::AudioZrtpSession * getAudioZrtpSession();  
 
+	/**
+         * Set remote cryptographic info. Should be called after negotiation in SDP
+	 * offer/answer session.
+         */
+        void setRemoteCryptoInfo();   
+        
         private:
            void * _rtpSession;
            RtpMethod _rtpSessionType;

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

@@ -52,14 +52,14 @@ AudioSrtpSession::AudioSrtpSession (ManagerImpl * manager, SIPCall * sipcall) :
     initializeInputCryptoContext();
     initializeOutputCryptoContext();
 
-    outputCryptoCtx->deriveSrtpKeys(0);
+    _outputCryptoCtx->deriveSrtpKeys(0);
 
-    setInQueueCryptoContext(inputCryptoCtx);
-    setOutQueueCryptoContext(outputCryptoCtx);
+    setInQueueCryptoContext(_inputCryptoCtx);
+    setOutQueueCryptoContext(_outputCryptoCtx);
 }
 
  
-std::string AudioSrtpSession::getCryptoSdpInfo() {
+std::string AudioSrtpSession::getLocalCryptoInfo() {
 
     _debug("Get Cryptographic info from this rtp session");
 
@@ -86,6 +86,13 @@ std::string AudioSrtpSession::getCryptoSdpInfo() {
 }
 
 
+void AudioSrtpSession::setRemoteCryptoInfo() {
+
+    _debug("Set remote Cryptographic info for this rtp session");
+
+}
+
+
 void AudioSrtpSession::initializeMasterKey(void)
 {
     _masterKeyLength = 16;
@@ -133,7 +140,7 @@ void AudioSrtpSession::initializeInputCryptoContext(void)
 
     // this one does not works
     // inputCryptoCtx = new ost::CryptoContext(IncomingDataQueue::getLocalSSRCNetwork(),
-  inputCryptoCtx = new ost::CryptoContext(0x0,
+    _inputCryptoCtx = new ost::CryptoContext(0x0,
 					     0,                           // roc,
 					     0L,                          // keydr,
 					     SrtpEncryptionAESCM,         // encryption algo
@@ -155,7 +162,7 @@ void AudioSrtpSession::initializeOutputCryptoContext(void)
 
     // this one works
     // outputCryptoCtx = new ost::CryptoContext(OutgoingDataQueue::getLocalSSRC(),
-    outputCryptoCtx = new ost::CryptoContext(OutgoingDataQueue::getLocalSSRC(),
+    _outputCryptoCtx = new ost::CryptoContext(OutgoingDataQueue::getLocalSSRC(),
 					      0,                           // roc,
 					      0L,                          // keydr,
 					      SrtpEncryptionAESCM,         // encryption algo

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

@@ -42,7 +42,9 @@ namespace sfl {
 
             AudioSrtpSession(ManagerImpl * manager, SIPCall * sipcall);
 
-	    std::string getCryptoSdpInfo(void);
+	    std::string getLocalCryptoInfo(void);
+
+	    void setRemoteCryptoInfo(void);
 
         private:
 
@@ -68,9 +70,9 @@ namespace sfl {
 
 	    int _masterSaltLength;
 
-	    ost::CryptoContext* inputCryptoCtx;
+	    ost::CryptoContext* _inputCryptoCtx;
 
-	    ost::CryptoContext* outputCryptoCtx;
+	    ost::CryptoContext* _outputCryptoCtx;
     };
    
 }

sflphone-common/src/sip/sipvoiplink.cpp

@@ -3217,6 +3217,8 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
     pjmedia_sdp_attr *attribute;
     call->getLocalSDP()->get_remote_sdp_crypto_from_offer(remote_sdp, &attribute);
 
+    
+    
     // create remote cryptografic offer
     std::vector<std::string> remoteOffer;
 
@@ -3231,6 +3233,14 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
 
     sfl::SdesNegotiator sdesnego(localCapabilities, remoteOffer);
 
+    sdesnego.negotiate();
+
+    if(sdesnego.negotiate()) {
+        _debug("******************** Negociation Is Successfull *********************\n");
+
+	call->getAudioRtp()->setRemoteCryptoInfo();
+    }
+
 
     try {
         call->setAudioStart (true);