[asterisk-scf-commits] asterisk-scf/release/sip.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  872c1fcf062ceb5d0e46383b3ee9da4a65545e58 (commit)
       via  6cea9d54eac34ea83f032d7da76ad114b7867e1c (commit)
      from  20bb5be857d5c414305cfce89ffa15a1cc9e2e3c (commit)

Summary of changes:
 src/SIPSession.cpp  |    4 ----
 src/SIPTransfer.cpp |    4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 872c1fcf062ceb5d0e46383b3ee9da4a65545e58
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Jan 3 12:41:43 2012 -0400

    We want to *replace* the session when doing transfers.

diff --git a/src/SIPTransfer.cpp b/src/SIPTransfer.cpp
index bd114db..494b0b7 100644
--- a/src/SIPTransfer.cpp
+++ b/src/SIPTransfer.cpp
@@ -480,7 +480,7 @@ SuspendableWorkResult HandleReferOperation::initial(const SuspendableWorkListene
 
             lg(Debug) << "handleRefer() calling router connectBridgedSessions(). ";
 
-            mSessionRouter->begin_connectBridgedSessions(operationId, mSession->getSessionProxy(), other_session->getSessionProxy(), false, d);
+            mSessionRouter->begin_connectBridgedSessions(operationId, mSession->getSessionProxy(), other_session->getSessionProxy(), true, d);
             pjsip_dlg_dec_lock(other_dlg);
             return Complete;
         }
@@ -519,7 +519,7 @@ SuspendableWorkResult HandleReferOperation::initial(const SuspendableWorkListene
             addNotifyBody(tdata, "SIP/2.0 100 Trying");
             pjsip_dlg_send_request(mInv->dlg, tdata, -1, NULL);
 
-            mSessionRouter->begin_connectBridgedSessionsWithDestination(operationId, session->getSessionProxy(), mTarget, false, mHook->getProxy(), d);
+            mSessionRouter->begin_connectBridgedSessionsWithDestination(operationId, session->getSessionProxy(), mTarget, true, mHook->getProxy(), d);
             return Complete;
         }
         catch (const Ice::CommunicatorDestroyedException &)

commit 6cea9d54eac34ea83f032d7da76ad114b7867e1c
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Jan 3 12:41:37 2012 -0400

    Remove old test code.

diff --git a/src/SIPSession.cpp b/src/SIPSession.cpp
index a6e1871..d8a1f73 100755
--- a/src/SIPSession.cpp
+++ b/src/SIPSession.cpp
@@ -1866,10 +1866,6 @@ public:
                 mImplPriv->mSessionController = 0;
             }
 
-            // Update the connected controller's ConnectedLine information.  
-            SessionOwnerIdPtr test;
-            mImplPriv->mSessionCookies.erase(test->ice_id());
-
             mCb->ice_response();
             return Complete;
         }

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


-- 
asterisk-scf/release/sip.git