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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  5ce307648b8ceee519b4f8347c648ad87c0a723b (commit)
       via  e3f28eb54ba6519bd07a7996abfd159227b2e03d (commit)
       via  4260e5faf767c539fb7c840d739a7a693488da3a (commit)
       via  48e54d3c6bdb2767f3fbb02c72094e64bb287aa4 (commit)
       via  e3295cdaaf584e78619d2784e72bcece305e7c68 (commit)
       via  7138ea7c5c1928f96326a2fa1b39921435638359 (commit)
       via  0fd99109e48ddafd46fcb39899f8ede7b2845e20 (commit)
       via  f719d3d9c1fd646e5765657eb8712d2d9c9c32a9 (commit)
       via  9bc2c4cf3c7b265ba02e2f23354f946a05dd96cb (commit)
       via  c0f7a2d811ea73492b1170ca53031fcd2b543ff8 (commit)
       via  2c7f7440e30bc4d923823224bac18d933f93b813 (commit)
       via  58a709ad3534c0d3b24c0e19314e3937a2516eda (commit)
       via  c3810529cf0895fc62a7f72d6de4b35ae495e979 (commit)
       via  ce69a3d44dd548559cc9745648839fd66add4369 (commit)
       via  517b96aa623d769f08db846acf6ff3d33f3e5127 (commit)
       via  bb1a8dcaa39686724ae25a43b15fe1f24d14ca6a (commit)
       via  c183f79c5692593ca6c29bd733f0e91a58ed6eac (commit)
       via  abf3baccf1d882471b293656aa4393e6f98aab45 (commit)
      from  fa9a1e07919211dbfc754e83161de216639b68d9 (commit)

Summary of changes:
 config/test_sip.conf                  |    2 +
 local-slice/SipStateReplicationIf.ice |    1 +
 src/CMakeLists.txt                    |    1 -
 src/PJSipSessionModule.cpp            |  125 ++++++++++++++++++++++++++++++---
 src/PJSipSessionModule.h              |    2 +-
 src/SipChannelServiceApp.cpp          |   26 +++++--
 src/SipSession.cpp                    |   67 +++++++++++++++++-
 src/SipSession.h                      |    4 +
 src/SipStateReplicatorListener.cpp    |    1 +
 9 files changed, 207 insertions(+), 22 deletions(-)


- Log -----------------------------------------------------------------
commit 5ce307648b8ceee519b4f8347c648ad87c0a723b
Merge: fa9a1e0 e3f28eb
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Oct 14 12:12:45 2010 -0300

    Add support for blind and attended transfers within the SIP session manager.
    
    Merge branch 'transfer'
    
    Conflicts:
    	src/SipChannelServiceApp.cpp

diff --cc src/SipChannelServiceApp.cpp
index 49d259d,e79d319..6a831bc
--- a/src/SipChannelServiceApp.cpp
+++ b/src/SipChannelServiceApp.cpp
@@@ -78,6 -78,8 +78,7 @@@ private
     void locateRoutingService();
     void locateSessionRouter();
     void locateStateReplicator();
+    void registerWithStateReplicator();
 -   void locateBridgeService();
     void registerWithRoutingService();
     void deregisterFromRoutingService();
     void configureEndpoints();

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


-- 
asterisk-scf/integration/sip.git