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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Tue Sep 13 11:47:04 CDT 2011


branch "master" has been updated
       via  c18c1c9ca971b3b08c0224f059c45052e71f636a (commit)
       via  8e37073a5318103b06dec8e241088244968a77fb (commit)
      from  ec01c62e89fc764c104d4552891d366db52ad9b9 (commit)

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


- Log -----------------------------------------------------------------
commit c18c1c9ca971b3b08c0224f059c45052e71f636a
Merge: ec01c62 8e37073
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Sep 13 11:48:43 2011 -0500

    Merge branch 'replacement'


commit 8e37073a5318103b06dec8e241088244968a77fb
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Aug 29 14:16:57 2011 -0500

    Make appropriate changes to accommodate API changes.

diff --git a/src/SipTransfer.cpp b/src/SipTransfer.cpp
index 117ea79..d6d2ede 100644
--- a/src/SipTransfer.cpp
+++ b/src/SipTransfer.cpp
@@ -479,7 +479,7 @@ SuspendableWorkResult HandleReferOperation::initial(const SuspendableWorkListene
 
             lg(Debug) << "handleRefer() calling router connectBridgedSessions(). ";
 
-            mSessionRouter->begin_connectBridgedSessions(operationId, mSession->getSessionProxy(), other_session->getSessionProxy(), d);
+            mSessionRouter->begin_connectBridgedSessions(operationId, mSession->getSessionProxy(), other_session->getSessionProxy(), false, d);
             pjsip_dlg_dec_lock(other_dlg);
             return Complete;
         }
@@ -518,7 +518,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, mHook->getProxy(), d);
+            mSessionRouter->begin_connectBridgedSessionsWithDestination(operationId, session->getSessionProxy(), mTarget, false, mHook->getProxy(), d);
             return Complete;
         }
         catch (const Ice::CommunicatorDestroyedException &)

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


-- 
asterisk-scf/release/sip.git



More information about the asterisk-scf-commits mailing list