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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu May 19 19:44:16 CDT 2011


branch "sip-threading" has been updated
       via  f3a7942f0d59d012314919d1f2e5437e9126a4f7 (commit)
       via  c65cf9a29833a1c60ce59a12b6b8670dae300bba (commit)
      from  3404992bd9dc27aef8461cfe0302254167e415bf (commit)

Summary of changes:
 src/TestEndpoint.cpp |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit f3a7942f0d59d012314919d1f2e5437e9126a4f7
Merge: 3404992 c65cf9a
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu May 19 09:07:53 2011 -0500

    Merge branch 'master' into sip-threading
    
    Conflicts:
    	src/TestEndpoint.cpp


commit c65cf9a29833a1c60ce59a12b6b8670dae300bba
Author: Brent Eagles <beagles at digium.com>
Date:   Wed May 18 23:55:22 2011 -0230

    Have start() send a connected indication to listeners.

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index ec84632..90ef50a 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -73,41 +73,41 @@ public:
     //
     void connected()
     {
-    mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::ConnectedIndication());
+        mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::ConnectedIndication());
     }
 
     void flashed()
     {
-    mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::FlashedIndication());
+        mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::FlashedIndication());
     }
 
     void held()
     {
-    mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::HeldIndication());
+        mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::HeldIndication());
     }
 
     void progressing(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
     {
-    AsteriskSCF::SessionCommunications::V1::ProgressingIndicationPtr indication(new AsteriskSCF::SessionCommunications::V1::ProgressingIndication());
+        AsteriskSCF::SessionCommunications::V1::ProgressingIndicationPtr indication(new AsteriskSCF::SessionCommunications::V1::ProgressingIndication());
         indication->response = response;
         mPublisher->indicated(mSession, indication);
     }
 
     void ringing()
     {
-    mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::RingingIndication());
+        mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::RingingIndication());
     }
 
     void stopped(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
     {
-    AsteriskSCF::SessionCommunications::V1::StoppedIndicationPtr indication(new AsteriskSCF::SessionCommunications::V1::StoppedIndication());
-    indication->response = response;
-    mPublisher->indicated(mSession, indication);
+        AsteriskSCF::SessionCommunications::V1::StoppedIndicationPtr indication(new AsteriskSCF::SessionCommunications::V1::StoppedIndication());
+        indication->response = response;
+        mPublisher->indicated(mSession, indication);
     }
 
     void unheld()
     {
-    mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::UnheldIndication());
+        mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::UnheldIndication());
     }
 
     void setProxy(const AsteriskSCF::SessionCommunications::V1::SessionPrx& prx)
@@ -151,7 +151,7 @@ public:
 
     void indicate(const AsteriskSCF::SessionCommunications::V1::IndicationPtr&, const Ice::Current&)
     {
-    mEndpointManager->log(mId, __FUNCTION__);
+        mEndpointManager->log(mId, __FUNCTION__);
     }
 
     void connect(const Ice::Current&)
@@ -214,6 +214,7 @@ public:
     void start(const Ice::Current&)
     {
         mEndpointManager->log(mId, __FUNCTION__);
+        mListeners->connected();
     }
 
     void stop(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)

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


-- 
asterisk-scf/integration/test_channel.git



More information about the asterisk-scf-commits mailing list