[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "sessioncontroller" updated.

[Commits to the Asterisk SCF project code repositories]

branch "sessioncontroller" has been updated
       via  9301688146850ecb9237fb8cf8393b54a6e4e0be (commit)
      from  4bb43fae612cf302652ba327555464ad22f73359 (commit)

Summary of changes:
 src/PJSipSessionModule.cpp |    2 ++
 src/SipSession.cpp         |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit 9301688146850ecb9237fb8cf8393b54a6e4e0be
Author: Joshua Colp <jcolp at digium.com>
Date:   Sun Jul 3 17:14:25 2011 -0300

    Fix a regression where a reinvite with SDP would receive a 200 OK without SDP.

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 1334ca7..6f0dbba 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -1488,6 +1488,7 @@ protected:
         // If we have no session controller respond to the reinvite with the same SDP that we previously had
         if (!controller)
         {
+            pjsip_inv_set_sdp_answer(mInv, session->modifySDP(StreamInformationDict()));
             pjsip_inv_send_reinvite_response(mInv, mResponse);
             return Complete;
         }
@@ -1505,6 +1506,7 @@ protected:
         // If no streams were added we can respond to the offer with the SDP we had previously and move on
         if (mStreamsAdded.empty())
         {
+            pjsip_inv_set_sdp_answer(mInv, session->modifySDP(StreamInformationDict()));
             pjsip_inv_send_reinvite_response(mInv, mResponse);
             return Complete;
         }
diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index 11862d4..642b191 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -2056,6 +2056,8 @@ pjmedia_sdp_session *SipSession::modifySDP(const AsteriskSCF::Media::V1::StreamI
         // The RFC states that an implementation MAY choose to remove all formats but one and all attributes
         // but at this point in time we choose not to do this
     }
+
+    return mImplPriv->mSDP;
 }
 
 /**

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git