[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "route_replica" created.

[Commits to the Asterisk SCF project code repositories]

branch "route_replica" has been created
        at  cb755f8a3323b07ee999aa1559439e1410dded92 (commit)

- Log -----------------------------------------------------------------
commit cb755f8a3323b07ee999aa1559439e1410dded92
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Mon Mar 7 01:22:20 2011 -0600

    Adds transaction id to the IceContext for all routing operations.

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 3080204..cd7ca72 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -555,7 +555,9 @@ void PJSipSessionModule::handleNewInvite(pjsip_rx_data *rdata)
             // If this is not an attended transfer we can just route the session as normally
             RouteSessionCallbackPtr cb = new RouteSessionCallback(inv_session, tdata);
             Ice::CallbackPtr d = Ice::newCallback(cb, &RouteSessionCallback::callback);
-            mSessionRouter->begin_routeSession(session->getSessionProxy(), destination, d);
+            Ice::Context context;
+            context[AsteriskSCF::SessionCommunications::V1::TransactionKey] = IceUtil::generateUUID();
+            mSessionRouter->begin_routeSession(session->getSessionProxy(), destination, context, d);
         }
     }
     catch (const Ice::CommunicatorDestroyedException &)
@@ -692,7 +694,9 @@ void PJSipSessionModule::handleRefer(pjsip_inv_session *inv, pjsip_rx_data *rdat
             Ice::CallbackPtr d = Ice::newCallback(cb, &ConnectBridgedSessionsCallback::callback);
 
             lg(Debug) << "handleRefer() calling router connectBridgedSessions(). ";
-            mSessionRouter->begin_connectBridgedSessions(session->getSessionProxy(), other_session->getSessionProxy(), d);
+            Ice::Context context;
+            context[AsteriskSCF::SessionCommunications::V1::TransactionKey] = IceUtil::generateUUID();
+            mSessionRouter->begin_connectBridgedSessions(session->getSessionProxy(), other_session->getSessionProxy(), context, d);
         }
         catch (const Ice::CommunicatorDestroyedException &)
         {
@@ -715,7 +719,9 @@ void PJSipSessionModule::handleRefer(pjsip_inv_session *inv, pjsip_rx_data *rdat
             Ice::CallbackPtr d = Ice::newCallback(cb, &ConnectBridgedSessionsWithDestinationCallback::callback);
 
             lg(Debug) << "handleRefer() calling router connectBridgedSessionsWithDestination(). ";
-            mSessionRouter->begin_connectBridgedSessionsWithDestination(session->getSessionProxy(), target, d);
+            Ice::Context context;
+            context[AsteriskSCF::SessionCommunications::V1::TransactionKey] = IceUtil::generateUUID();
+            mSessionRouter->begin_connectBridgedSessionsWithDestination(session->getSessionProxy(), target, context, d);
         }
         catch (const Ice::CommunicatorDestroyedException &)
         {

commit fbc8753fefcc92e2075c053866bb61ca940add6a
Merge: 5b6eafb 7217fe2
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Mar 3 16:18:52 2011 -0600

    Merge branch 'master' of gitdepot:asterisk-scf/release/sip into route_async

diff --cc src/CMakeLists.txt
index 413cab4,d03df8c..e06526a
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -78,9 -66,13 +66,12 @@@ include_directories(${API_INCLUDE_DIR}
  
  asterisk_scf_component_add_file(SipStateReplicator SipStateReplicatorApp.cpp)
  asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.h)
- #asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.cpp)
+ asterisk_scf_component_add_slice(SipStateReplicator
+     ../local-slice/SipStateReplicationIf.ice)
+ asterisk_scf_component_add_slice(SipStateReplicator
+     ../local-slice/SipIf.ice)
  
  asterisk_scf_component_add_ice_libraries(SipStateReplicator IceStorm)
 -asterisk_scf_component_add_boost_libraries(SipStateReplicator thread date_time)
  
  asterisk_scf_component_build_icebox(SipStateReplicator)
  target_link_libraries(SipStateReplicator logging-client)

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


-- 
asterisk-scf/integration/sip.git