[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "session_cookies" updated.

[Commits to the Asterisk SCF project code repositories]

branch "session_cookies" has been updated
       via  0a6a218df72a69c7154ce01002a2dc2bce806183 (commit)
       via  eee61313875db02d8159c74d426bb64a406d9d6b (commit)
       via  eecb7046abd3fcd0dcf069da962004591ae68972 (commit)
       via  fc859d79f234dfe789e669efd771e615eb52ddcc (commit)
       via  fffdcb241ce942415bb8fe17a9f266d0e7a1ecdf (commit)
       via  396cbc558718ce9f6abd2c47e89a9b1b55ed2083 (commit)
       via  8c2c50a7406cacfb529a3e510e953f960035778b (commit)
       via  9f163f823e256bd86b841d924997983b14b840b0 (commit)
      from  ed1292522c2fa00c8b55eaecb6a5f0ed1494d8d7 (commit)

Summary of changes:
 src/MediaSession.h   |    4 +-
 src/Service.cpp      |   52 +++++++++++++++++++++++++++++++++++++++++++------
 src/TestEndpoint.cpp |   50 ++++++++++++++++++++++++++++++-----------------
 src/TestEndpoint.h   |    2 +-
 4 files changed, 80 insertions(+), 28 deletions(-)


- Log -----------------------------------------------------------------
commit 0a6a218df72a69c7154ce01002a2dc2bce806183
Merge: ed12925 eee6131
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue Apr 26 13:53:50 2011 -0300

    Merge remote branch 'origin/master' into session_cookies
    
    Conflicts:
    	src/TestEndpoint.cpp

diff --cc src/TestEndpoint.cpp
index 16bd1a6,2ad670e..8f71755
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@@ -73,37 -73,41 +73,46 @@@ public
      //
      void connected()
      {
-         mPublisher->connected(mSession,  AsteriskSCF::SessionCommunications::V1::SessionCookies());
 -	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::ConnectedIndication());
++	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::ConnectedIndication(),
++	    AsteriskSCF::SessionCommunications::V1::SessionCookies());
      }
  
      void flashed()
      {
-         mPublisher->flashed(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies());
 -	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::FlashedIndication());
++	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::FlashedIndication(),
++	    AsteriskSCF::SessionCommunications::V1::SessionCookies());
      }
  
      void held()
      {
-         mPublisher->held(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies());
 -	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::HeldIndication());
++	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::HeldIndication(),
++	    AsteriskSCF::SessionCommunications::V1::SessionCookies());
      }
  
      void progressing(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
      {
-         mPublisher->progressing(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies(), response);
+ 	AsteriskSCF::SessionCommunications::V1::ProgressingIndicationPtr progressing(new AsteriskSCF::SessionCommunications::V1::ProgressingIndication());
+         progressing->response = response;
 -        mPublisher->indicated(mSession, progressing);
++        mPublisher->indicated(mSession, progressing, AsteriskSCF::SessionCommunications::V1::SessionCookies());
      }
  
      void ringing()
      {
-         mPublisher->ringing(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies());
 -	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::RingingIndication());
++	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::RingingIndication(),
++	    AsteriskSCF::SessionCommunications::V1::SessionCookies());
      }
  
      void stopped(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
      {
-         mPublisher->stopped(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies(), response);
+ 	AsteriskSCF::SessionCommunications::V1::StoppedIndicationPtr stopped(new AsteriskSCF::SessionCommunications::V1::StoppedIndication());
+ 	stopped->response = response;
 -	mPublisher->indicated(mSession, stopped);
++	mPublisher->indicated(mSession, stopped, AsteriskSCF::SessionCommunications::V1::SessionCookies());
      }
  
      void unheld()
      {
-         mPublisher->unheld(mSession, AsteriskSCF::SessionCommunications::V1::SessionCookies());
 -	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::UnheldIndication());
++	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::UnheldIndication(),
++	    AsteriskSCF::SessionCommunications::V1::SessionCookies());
      }
  
      void setProxy(const AsteriskSCF::SessionCommunications::V1::SessionPrx& prx)

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


-- 
asterisk-scf/integration/test_channel.git