[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  d97711f244f7fdddc8abcb96437d035a70e08da8 (commit)
      from  edf99b7f203e6b652fc364aff6c3f6f5b670bdd3 (commit)

Summary of changes:
 local-slice/SipStateReplicationIf.ice |    4 ++--
 src/PJSipSessionModule.cpp            |    8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit d97711f244f7fdddc8abcb96437d035a70e08da8
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Sep 20 10:24:31 2010 -0500

    Fill in updateStatus method for SIP sessions.
    Change Session state item to have a single media session proxy instead of a sequence.

diff --git a/local-slice/SipStateReplicationIf.ice b/local-slice/SipStateReplicationIf.ice
index 316c4c8..4483bc7 100644
--- a/local-slice/SipStateReplicationIf.ice
+++ b/local-slice/SipStateReplicationIf.ice
@@ -84,7 +84,7 @@ module V1
    };
 
    // Should this exist within MediaIf.ice? Are we going to pass around a sequence of sessions elsewhere?
-   sequence<AsteriskSCF::Media::V1::Session*> MediaSessionSeq;
+   //sequence<AsteriskSCF::Media::V1::Session*> MediaSessionSeq;
 
    class SipSessionStateItem extends SipStateItem
    {
@@ -92,7 +92,7 @@ module V1
 	  //here, but frankly I have no clue.
       AsteriskSCF::Media::V1::StreamSourceSeq mSources;
       AsteriskSCF::Media::V1::StreamSinkSeq mSinks;
-      MediaSessionSeq mMediaSessions;
+      AsteriskSCF::Media::V1::Session *mMediaSession;
    };
 
 }; //module V1
diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 62ffed8..ec47ad7 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -198,7 +198,13 @@ public:
 	*/
    void updateSessionState()
    {
-      //stub;
+      mSessionState->mSources = mSession->getSources();
+      mSessionState->mSinks = mSession->getSinks();
+      //getMediaSession requires an Ice::Current reference. Since
+      //it's not actually used, we can get away with passing a dummy
+      //instead.
+      Ice::Current dummy;
+      mSessionState->mMediaSession = mSession->getMediaSession(dummy);
    }
    SipSessionPtr getSessionPtr()
    {

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


-- 
asterisk-scf/integration/sip.git