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

[Commits to the Asterisk SCF project code repositories]

branch "directmedia" has been updated
       via  7c4596823c88ab5310e64ca48f4b5d9f1b399087 (commit)
       via  65e50a15edfe96b0e7e6ca64788871407972274c (commit)
       via  59232c550a9b200116487fae10e062b7831cccd8 (commit)
       via  6def3ef1608104dd66c9a8128a976a8c248495fc (commit)
       via  105dae6cef0812e024b028f0831bbd70e26f3d8e (commit)
       via  602337e57720cd9ab0689d440a1c39143de50d1e (commit)
      from  a274eda1bfb32791b092950b644dfc319edcfac8 (commit)

Summary of changes:
 src/PJSipSessionModule.cpp |    6 ++--
 src/SipSession.cpp         |   86 +++++++++++++++++++++++++++++++++++---------
 src/SipSession.h           |    3 +-
 3 files changed, 74 insertions(+), 21 deletions(-)


- Log -----------------------------------------------------------------
commit 7c4596823c88ab5310e64ca48f4b5d9f1b399087
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Jul 28 17:57:52 2011 -0300

    Always use a reinvite to direct media.

diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index 85785d1..30e4232 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -644,20 +644,18 @@ public:
 
     SuspendableWorkResult execute(const SuspendableWorkListenerPtr&)
     {
-        pjmedia_sdp_session *sdp = mSession->modifySDP(mConnections);
-
-        if (!mSession->getInviteSession()->invite_tsx)
+        if (mSession->getInviteSession()->invite_tsx)
         {
-            pjsip_tx_data *packet = NULL;
-
-            if ((pjsip_inv_reinvite(mSession->getInviteSession(), NULL, sdp, &packet)) == PJ_SUCCESS)
-            {
-                pjsip_inv_send_msg(mSession->getInviteSession(), packet);
-            }
+            mSession->enqueueSessionWork(this);
+            return Complete;
         }
-        else
+
+        pjmedia_sdp_session *sdp = mSession->modifySDP(mConnections);
+        pjsip_tx_data *packet = NULL;
+
+        if ((pjsip_inv_reinvite(mSession->getInviteSession(), NULL, sdp, &packet)) == PJ_SUCCESS)
         {
-            pjsip_inv_set_sdp_answer(mSession->getInviteSession(), sdp);
+            pjsip_inv_send_msg(mSession->getInviteSession(), packet);
         }
 
         mCb->ice_response();

commit 65e50a15edfe96b0e7e6ca64788871407972274c
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Jul 28 17:28:59 2011 -0300

    General cleanup.

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 9b0e73b..86f8420 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -1401,7 +1401,7 @@ void PJSipSessionModule::invOnTsxStateChanged(pjsip_inv_session *inv, pjsip_tran
     }
 }
 
-void PJSipSessionModule::invOnRxOffer(pjsip_inv_session* inv, const pjmedia_sdp_session*)
+void PJSipSessionModule::invOnRxOffer(pjsip_inv_session*, const pjmedia_sdp_session*)
 {
     //stub
 }
diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index 5afa818..85785d1 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -463,7 +463,7 @@ public:
         // Okay, create and send the reinvite!
         pjsip_tx_data *packet = NULL;
             
-        if ((pjsip_inv_reinvite(mImplPriv->mInviteSession, NULL, mImplPriv->mSDP, &packet)) == PJ_SUCCESS)
+        if ((pjsip_inv_reinvite(mImplPriv->mInviteSession, NULL, sdp, &packet)) == PJ_SUCCESS)
         {
             pjsip_inv_send_msg(mImplPriv->mInviteSession, packet);
         }

commit 59232c550a9b200116487fae10e062b7831cccd8
Merge: a274eda 6def3ef
Author: Joshua Colp <jcolp at digium.com>
Date:   Sat Jul 23 21:49:16 2011 -0300

    Merge branch 'sessioncontroller' into directmedia


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


-- 
asterisk-scf/integration/sip.git