[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "media" created.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Mon Jun 13 15:39:40 CDT 2011


branch "media" has been created
        at  b1974a9302e151484e2c9936038de6c10091004d (commit)

- Log -----------------------------------------------------------------
commit b1974a9302e151484e2c9936038de6c10091004d
Author: Joshua Colp <jcolp at digium.com>
Date:   Sun Jun 12 17:33:32 2011 -0300

    Update to support multiple sinks.

diff --git a/src/MediaEchoThread.cpp b/src/MediaEchoThread.cpp
index c9eccf1..e4f355c 100644
--- a/src/MediaEchoThread.cpp
+++ b/src/MediaEchoThread.cpp
@@ -30,17 +30,22 @@ void MediaEchoThread::run()
     {
         mMonitor.wait();
 
-        if(!mDone && mFrames.size() > 0 && mSink != 0)
+        if(!mDone && mFrames.size() > 0 && !mSinks.empty())
         {
-            try
-            {
-                mSink->write(mFrames);
-                mFrames.clear();
-            }
-            catch(const Ice::Exception&)
-            {
-                // TODO: log and continue
-            }
+	    for (AsteriskSCF::Media::V1::StreamSinkSeq::const_iterator sink = mSinks.begin();
+		 sink != mSinks.end();
+		 ++sink)
+	    {
+		try
+		{
+		    (*sink)->write(mFrames);
+		}
+		catch(const Ice::Exception&)
+		{
+		    // TODO: log and continue
+		}
+	    }
+	    mFrames.clear();
         }
     }
 }
@@ -62,10 +67,10 @@ void MediaEchoThread::destroy()
     mMonitor.notify();
 }
 
-void MediaEchoThread::setSink(const AsteriskSCF::Media::V1::StreamSinkPrx& prx)
+void MediaEchoThread::setSinks(const AsteriskSCF::Media::V1::StreamSinkSeq& sinks)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mMonitor);
-    mSink = prx;
+    mSinks = sinks;
     if(!mPaused)
     {
         mMonitor.notify();
diff --git a/src/MediaEchoThread.h b/src/MediaEchoThread.h
index e6d0ea5..7badc8f 100644
--- a/src/MediaEchoThread.h
+++ b/src/MediaEchoThread.h
@@ -25,7 +25,7 @@ public:
     void run();
     void pushFrames(const AsteriskSCF::Media::V1::FrameSeq& newFrames);
     void destroy();
-    void setSink(const AsteriskSCF::Media::V1::StreamSinkPrx& prx);
+    void setSinks(const AsteriskSCF::Media::V1::StreamSinkSeq& sinks);
 
     //
     // Use when paused... causes the loop to run once.
@@ -35,7 +35,7 @@ public:
     void resume();
 
 private:
-    AsteriskSCF::Media::V1::StreamSinkPrx mSink;
+    AsteriskSCF::Media::V1::StreamSinkSeq mSinks;
     IceUtil::Monitor<IceUtil::Mutex> mMonitor;
     AsteriskSCF::Media::V1::FrameSeq mFrames;
     bool mDone;
diff --git a/src/MediaSession.h b/src/MediaSession.h
index 511cc22..3978944 100644
--- a/src/MediaSession.h
+++ b/src/MediaSession.h
@@ -69,9 +69,9 @@ public:
         // XXX
     }
 
-    void setRelaySink(const AsteriskSCF::Media::V1::StreamSinkPrx& sink)
+    void setRelaySinks(const AsteriskSCF::Media::V1::StreamSinkSeq& sinks)
     {
-        mThread->setSink(sink);
+        mThread->setSinks(sinks);
     }
 
     void echo()
@@ -110,15 +110,22 @@ public:
     {
     }
 
-    void setSink(const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&)
+    void addSink(const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&)
     {
-        mSink = sink;
-        mSinkServant->setRelaySink(mSink);
+	mSinks.push_back(sink);
+	mSinkServant->setRelaySinks(mSinks);
     }
 
-    AsteriskSCF::Media::V1::StreamSinkPrx getSink(const Ice::Current&)
+    void removeSink(const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&)
     {
-        return mSink;
+        mSinks.erase(std::remove(mSinks.begin(), mSinks.end(),
+                                     sink), mSinks.end());
+	mSinkServant->setRelaySinks(mSinks);
+    }
+
+    AsteriskSCF::Media::V1::StreamSinkSeq getSinks(const Ice::Current&)
+    {
+        return mSinks;
     }
 
     AsteriskSCF::Media::V1::FormatSeq getFormats(const Ice::Current&)
@@ -137,7 +144,7 @@ public:
     }
 
 private:
-    AsteriskSCF::Media::V1::StreamSinkPrx mSink;
+    AsteriskSCF::Media::V1::StreamSinkSeq mSinks;
     AsteriskSCF::Media::V1::FormatSeq mFormats;
     std::string mId;
     SinkIPtr mSinkServant;

commit 8b648ed0c94e7e5e4366ba3e1b59f74586c94e32
Author: Brent Eagles <beagles at digium.com>
Date:   Wed May 25 12:15:03 2011 -0230

    Remove duplicate logging of operation

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index e0525c2..94c3cab 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -166,7 +166,6 @@ public:
             msg = __FUNCTION__;
         }
         mEndpointManager->log(mId, msg);
-        mEndpointManager->log(mId, __FUNCTION__);
         cb->ice_response();
     }
 

commit db70372bebd4d1e3c1e7300cb640f1a9102e9a7c
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon May 23 16:29:39 2011 -0500

    Fix a merge error.

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 828182e..e0525c2 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -152,7 +152,7 @@ public:
 
     void indicate_async(
             const AsteriskSCF::SessionCommunications::V1::AMD_Session_indicatePtr& cb,
-            const AsteriskSCF::SessionCommunications::V1::IndicationPtr&,
+            const AsteriskSCF::SessionCommunications::V1::IndicationPtr& value,
             const Ice::Current&)
     {
         std::string msg;

commit 1f84b83379bc5d3b531a43b6efe4850cc6f2429a
Merge: f3a7942 34a177e
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon May 23 15:51:54 2011 -0500

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/test_channel
    
    Conflicts:
    	src/TestEndpoint.cpp

diff --cc src/TestEndpoint.cpp
index bf2fe9b,538c522..828182e
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@@ -147,16 -146,22 +147,27 @@@ public
      {
          mListeners->addListener(listener);
          mEndpointManager->log(mId, __FUNCTION__);
 -        return mInfo;
 +        cb->ice_response(mInfo);
      }
  
 -    void indicate(const AsteriskSCF::SessionCommunications::V1::IndicationPtr& value, const Ice::Current&)
 +    void indicate_async(
 +            const AsteriskSCF::SessionCommunications::V1::AMD_Session_indicatePtr& cb,
 +            const AsteriskSCF::SessionCommunications::V1::IndicationPtr&,
 +            const Ice::Current&)
      {
+         std::string msg;
+         if (value)
+         {
+             msg = value->ice_id() + ":";
+             msg += __FUNCTION__;
+         }
+         else
+         {
+             msg = __FUNCTION__;
+         }
+         mEndpointManager->log(mId, msg);
 +        mEndpointManager->log(mId, __FUNCTION__);
 +        cb->ice_response();
      }
  
      void connect(const Ice::Current&)

commit 34a177e2628b60d7fa8da14b35f65f4c79659eee
Author: Brent Eagles <beagles at digium.com>
Date:   Fri May 20 17:52:16 2011 -0230

    Improve the information logged by the indicate method.

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 90ef50a..538c522 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -149,9 +149,19 @@ public:
         return mInfo;
     }
 
-    void indicate(const AsteriskSCF::SessionCommunications::V1::IndicationPtr&, const Ice::Current&)
+    void indicate(const AsteriskSCF::SessionCommunications::V1::IndicationPtr& value, const Ice::Current&)
     {
-        mEndpointManager->log(mId, __FUNCTION__);
+        std::string msg;
+        if (value)
+        {
+            msg = value->ice_id() + ":";
+            msg += __FUNCTION__;
+        }
+        else
+        {
+            msg = __FUNCTION__;
+        }
+        mEndpointManager->log(mId, msg);
     }
 
     void connect(const Ice::Current&)

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&)

commit 3404992bd9dc27aef8461cfe0302254167e415bf
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue May 10 17:28:08 2011 -0500

    Adjust for changes in SessionCommunicationsIf.ice

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 9d50d43..fda9295 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -140,18 +140,23 @@ public:
         mInfo->currentState = "ready";
     }
 
-    AsteriskSCF::SessionCommunications::V1::SessionInfoPtr addListener(
-        const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
+    void addListener_async(
+            const AsteriskSCF::SessionCommunications::V1::AMD_Session_addListenerPtr& cb,
+            const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
             const Ice::Current&)
     {
         mListeners->addListener(listener);
         mEndpointManager->log(mId, __FUNCTION__);
-        return mInfo;
+        cb->ice_response(mInfo);
     }
 
-    void indicate(const AsteriskSCF::SessionCommunications::V1::IndicationPtr&, const Ice::Current&)
+    void indicate_async(
+            const AsteriskSCF::SessionCommunications::V1::AMD_Session_indicatePtr& cb,
+            const AsteriskSCF::SessionCommunications::V1::IndicationPtr&,
+            const Ice::Current&)
     {
-    mEndpointManager->log(mId, __FUNCTION__);
+        mEndpointManager->log(mId, __FUNCTION__);
+        cb->ice_response();
     }
 
     void connect(const Ice::Current&)
@@ -164,19 +169,25 @@ public:
         mEndpointManager->log(mId, __FUNCTION__);
     }
 
-    AsteriskSCF::SessionCommunications::V1::SessionEndpointPrx getEndpoint(const Ice::Current&)
+    void getEndpoint_async(
+            const AsteriskSCF::SessionCommunications::V1::AMD_Session_getEndpointPtr& cb,
+            const Ice::Current&)
     {
         mEndpointManager->log(mId, __FUNCTION__);
-        return mEndpointPrx;
+        cb->ice_response(mEndpointPrx);
     }
 
-    AsteriskSCF::SessionCommunications::V1::SessionInfoPtr getInfo(const Ice::Current&)
+    void getInfo_async(
+            const AsteriskSCF::SessionCommunications::V1::AMD_Session_getInfoPtr& cb,
+            const Ice::Current&)
     {
         mEndpointManager->log(mId, __FUNCTION__);
-        return 0;
+        cb->ice_response(0);
     }
 
-    AsteriskSCF::Media::V1::SessionPrx getMediaSession(const Ice::Current& current)
+    void getMediaSession_async(
+            const AsteriskSCF::SessionCommunications::V1::AMD_Session_getMediaSessionPtr& cb,
+            const Ice::Current& current)
     {
         mEndpointManager->log(mId, __FUNCTION__);
         boost::unique_lock<boost::shared_mutex> lock(mMutex);
@@ -186,8 +197,8 @@ public:
                 current.adapter->add(new MediaSessionI(mId + "Media", current.adapter),
                     current.adapter->getCommunicator()->stringToIdentity(mId + "Media")));
         }
-        return mMediaSession;
-    };
+        cb->ice_response(mMediaSession);
+    }
 
     void hold(const Ice::Current&)
     {
@@ -199,8 +210,9 @@ public:
         mEndpointManager->log(mId, __FUNCTION__);
     }
 
-    void removeListener(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
-        const Ice::Current&)
+    void removeListener(
+            const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
+            const Ice::Current&)
     {
         mListeners->removeListener(listener);
         mEndpointManager->log(mId, __FUNCTION__);
@@ -226,17 +238,20 @@ public:
         mEndpointManager->log(mId, __FUNCTION__);
     }
 
-    AsteriskSCF::SessionCommunications::V1::BridgePrx getBridge(const Ice::Current&)
+    void getBridge_async(
+            const AsteriskSCF::SessionCommunications::V1::AMD_Session_getBridgePtr& cb,
+            const Ice::Current&)
     {
         mEndpointManager->log(mId, __FUNCTION__);
-        return mCurrentBridge;
+        cb->ice_response(mCurrentBridge);
     }
 
     /**
      * This method is marked as "amd" in the slice, but we are not bothering with actually
      * dispatching the message in the test endpoint, at least not for now anyway.
      */
-    void setBridge_async(const AsteriskSCF::SessionCommunications::V1::AMD_Session_setBridgePtr& cb,
+    void setBridge_async(
+            const AsteriskSCF::SessionCommunications::V1::AMD_Session_setBridgePtr& cb,
             const AsteriskSCF::SessionCommunications::V1::BridgePrx& newBridge,
             const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
             const Ice::Current&)
@@ -248,16 +263,22 @@ public:
         cb->ice_response(mInfo);
     }
 
-    void removeBridge(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
+    void removeBridge_async(
+            const AsteriskSCF::SessionCommunications::V1::AMD_Session_removeBridgePtr& cb,
+            const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
+            const Ice::Current&)
     {
         boost::unique_lock<boost::shared_mutex> lock(mMutex);
         if(!mCurrentBridge)
         {
-            throw AsteriskSCF::SessionCommunications::V1::NotBridged();
+            cb->ice_exception(AsteriskSCF::SessionCommunications::V1::NotBridged());
+            //XXX Are we supposed to throw or just return here?
+            return;
         }
         mListeners->removeListener(listener);
         mCurrentBridge = 0;
         mEndpointManager->log(mId, __FUNCTION__);
+        cb->ice_response();
     }
 
     void echo()

commit 285080414aa697bfed60d317c61fb5545ac15116
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon May 9 16:33:44 2011 -0500

    Adjust for AMD changes in Session::setBridge

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index ec84632..9d50d43 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -232,14 +232,20 @@ public:
         return mCurrentBridge;
     }
 
-    AsteriskSCF::SessionCommunications::V1::SessionInfoPtr setBridge(const AsteriskSCF::SessionCommunications::V1::BridgePrx& newBridge,
-        const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
+    /**
+     * This method is marked as "amd" in the slice, but we are not bothering with actually
+     * dispatching the message in the test endpoint, at least not for now anyway.
+     */
+    void setBridge_async(const AsteriskSCF::SessionCommunications::V1::AMD_Session_setBridgePtr& cb,
+            const AsteriskSCF::SessionCommunications::V1::BridgePrx& newBridge,
+            const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
+            const Ice::Current&)
     {
         boost::unique_lock<boost::shared_mutex> lock(mMutex);
         mCurrentBridge = newBridge;
         mListeners->addListener(listener);
         mEndpointManager->log(mId, __FUNCTION__);
-        return mInfo;
+        cb->ice_response(mInfo);
     }
 
     void removeBridge(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)

commit e7c0727c3dee7cb81456f793aee477fd9d7efa98
Author: David M. Lee <dlee at digium.com>
Date:   Fri May 6 11:26:47 2011 -0500

    Fixed some unused param warnings.

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 2ba23de..ec84632 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -539,7 +539,7 @@ public:
         adapter->addFacet(mCommands, adapter->getCommunicator()->stringToIdentity(id), "Commands");
     }
 
-    virtual void lookup_async(const ::AsteriskSCF::Core::Routing::V1::AMD_EndpointLocator_lookupPtr& cb, const ::std::string& destination, const ::Ice::Current&)
+    virtual void lookup_async(const ::AsteriskSCF::Core::Routing::V1::AMD_EndpointLocator_lookupPtr& cb, const ::std::string&, const ::Ice::Current&)
     {
         AsteriskSCF::Core::Endpoint::V1::EndpointSeq result;
         result.push_back(mEndpointProxy);

commit c0a4ce182691df0bbcafb9b2474ac3ec2e3f7c04
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Dec 22 17:37:58 2010 -0600

    Changes for AMD operation on EndpointLocator interface.

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 33d04b2..2ba23de 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&)
@@ -539,11 +539,11 @@ public:
         adapter->addFacet(mCommands, adapter->getCommunicator()->stringToIdentity(id), "Commands");
     }
 
-    AsteriskSCF::Core::Endpoint::V1::EndpointSeq lookup(const std::string&, const Ice::Current&)
+    virtual void lookup_async(const ::AsteriskSCF::Core::Routing::V1::AMD_EndpointLocator_lookupPtr& cb, const ::std::string& destination, const ::Ice::Current&)
     {
         AsteriskSCF::Core::Endpoint::V1::EndpointSeq result;
         result.push_back(mEndpointProxy);
-        return result;
+        cb->ice_response(result);
     }
 
 private:

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


-- 
asterisk-scf/integration/test_channel.git



More information about the asterisk-scf-commits mailing list