[asterisk-scf-commits] team/ken.hunt/route_async_test_channel.git branch "route_async" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Wed Dec 22 23:40:06 UTC 2010
branch "route_async" has been created
at 2ffcaebcab6f2d40ec30e8fedb079e6ce7b0969b (commit)
- Log -----------------------------------------------------------------
commit 2ffcaebcab6f2d40ec30e8fedb079e6ce7b0969b
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 e912020..c22fec4 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -530,11 +530,12 @@ public:
adapter->add(mCommands, adapter->getCommunicator()->stringToIdentity(mManagerId + ".Commands"));
}
- AsteriskSCF::Core::Endpoint::V1::EndpointSeq lookup(const std::string& destination, 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:
commit 4bca5d0f23c4c5273d8f23f6b934144b49ca089f
Author: David M. Lee <dlee at digium.com>
Date: Tue Nov 30 16:47:44 2010 -0600
Move EndpointLocatorI to anonymous namespace.
Old versions of gcc (v4.1.2) erroneously warn when class members are
from an anonymous namespace. While there's technically nothing wrong
with it, the class EndpointLocatorI is only used in this file, so can
safely be moved to an anonymous namespace.
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 630ea70..e912020 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -515,12 +515,6 @@ public:
private:
EndpointManagerPtr mMgr;
};
-}
-
-namespace AsteriskSCF
-{
-namespace TestUtil
-{
class EndpointLocatorI : public AsteriskSCF::Core::Routing::V1::EndpointLocator
{
@@ -554,6 +548,13 @@ private:
typedef IceUtil::Handle<EndpointLocatorI> EndpointLocatorIPtr;
+}
+
+namespace AsteriskSCF
+{
+namespace TestUtil
+{
+
AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr TestEndpoint::create(const Ice::ObjectAdapterPtr& adapter, const std::string& id)
{
commit 93501e90428b9c45b02316d13eee8b087c4fea6c
Author: David M. Lee <dlee at digium.com>
Date: Mon Nov 15 14:03:39 2010 -0600
Updated indentation to match the style guide.
diff --git a/src/ConsoleDriver.h b/src/ConsoleDriver.h
index 605e876..ed267e6 100644
--- a/src/ConsoleDriver.h
+++ b/src/ConsoleDriver.h
@@ -28,7 +28,7 @@ class ConsoleDriver : virtual public IceUtil::Thread
{
public:
ConsoleDriver();
-
+
void run();
void setHandler(const AsteriskSCF::TestChannel::V1::CommandsPrx& handler);
void write(const std::string& msg);
diff --git a/src/InternalExceptions.h b/src/InternalExceptions.h
index 9f43732..c5e104b 100644
--- a/src/InternalExceptions.h
+++ b/src/InternalExceptions.h
@@ -17,37 +17,37 @@ namespace AsteriskSCF
{
namespace TestUtil
{
- class ConfigException : public std::exception
- {
- public:
+class ConfigException : public std::exception
+{
+public:
- ConfigException(const std::string& propertyName, const std::string& message)
+ ConfigException(const std::string& propertyName, const std::string& message)
+ {
+ std::stringstream msg;
+ msg << propertyName << " configuration error: ";
+ if(message.size() != 0)
{
- std::stringstream msg;
- msg << propertyName << " configuration error: ";
- if(message.size() != 0)
- {
- msg << message;
- }
- else
- {
- msg << "(no message)";
- }
- mWhat = msg.str();
+ msg << message;
}
-
- ~ConfigException() throw()
+ else
{
+ msg << "(no message)";
}
+ mWhat = msg.str();
+ }
- const char* what() const
- throw()
- {
- return mWhat.c_str();
- }
+ ~ConfigException() throw()
+ {
+ }
+
+ const char* what() const
+ throw()
+ {
+ return mWhat.c_str();
+ }
- private:
- std::string mWhat;
- };
+private:
+ std::string mWhat;
+};
}
}
diff --git a/src/ListenerManager.h b/src/ListenerManager.h
index 1be7165..17f3932 100644
--- a/src/ListenerManager.h
+++ b/src/ListenerManager.h
@@ -19,140 +19,140 @@ namespace AsteriskSCF
{
namespace TestUtil
{
- //
- // Helper template for classes that need to implement listener style interfaces.
- //
- template <class T>
- class ListenerManagerT : public IceUtil::Shared
+//
+// Helper template for classes that need to implement listener style interfaces.
+//
+template <class T>
+class ListenerManagerT : public IceUtil::Shared
+{
+ typedef std::vector<T> ListenerSeq;
+ typename std::vector<T>::iterator ListenerIter;
+public:
+ ListenerManagerT(const Ice::CommunicatorPtr& communicator, const std::string& topicName) :
+ mCommunicator(communicator),
+ mTopicName(topicName)
{
- typedef std::vector<T> ListenerSeq;
- typename std::vector<T>::iterator ListenerIter;
- public:
- ListenerManagerT(const Ice::CommunicatorPtr& communicator, const std::string& topicName) :
- mCommunicator(communicator),
- mTopicName(topicName)
+ //
+ // TODO: While this is being concocted for a single component, it would make more sense
+ // to have the topic manager passed in during construction for more general usage.
+ //
+ const std::string propertyName = "TopicManager.Proxy";
+ std::string topicManagerProperty = mCommunicator->getProperties()->getProperty(propertyName);
+ if(topicManagerProperty.size() == 0)
{
- //
- // TODO: While this is being concocted for a single component, it would make more sense
- // to have the topic manager passed in during construction for more general usage.
- //
- const std::string propertyName = "TopicManager.Proxy";
- std::string topicManagerProperty = mCommunicator->getProperties()->getProperty(propertyName);
- if(topicManagerProperty.size() == 0)
- {
- throw ConfigException(propertyName, "Topic manager proxy property missing. "
- "Unable to initialize listener support.");
- }
+ throw ConfigException(propertyName, "Topic manager proxy property missing. "
+ "Unable to initialize listener support.");
+ }
- try
- {
- mTopicManager = IceStorm::TopicManagerPrx::checkedCast(mCommunicator->stringToProxy(topicManagerProperty));
- }
- catch(const Ice::Exception&)
- {
- }
- if(!mTopicManager)
- {
- throw ConfigException(propertyName, "Topic manager proxy is not a valid proxy or is unreachable");
- }
+ try
+ {
+ mTopicManager = IceStorm::TopicManagerPrx::checkedCast(mCommunicator->stringToProxy(topicManagerProperty));
+ }
+ catch(const Ice::Exception&)
+ {
+ }
+ if(!mTopicManager)
+ {
+ throw ConfigException(propertyName, "Topic manager proxy is not a valid proxy or is unreachable");
+ }
- try
- {
- mTopic = mTopicManager->retrieve(mTopicName);
- }
- catch(const IceStorm::NoSuchTopic&)
- {
- }
+ try
+ {
+ mTopic = mTopicManager->retrieve(mTopicName);
+ }
+ catch(const IceStorm::NoSuchTopic&)
+ {
+ }
- if(!mTopic)
+ if(!mTopic)
+ {
+ try
{
- try
- {
- mTopic = mTopicManager->create(mTopicName);
- }
- catch(const IceStorm::TopicExists&)
- {
- //
- // In case there is a race condition when creating the topic.
- //
- mTopic = mTopicManager->retrieve(mTopicName);
- }
+ mTopic = mTopicManager->create(mTopicName);
}
-
- if(!mTopic)
+ catch(const IceStorm::TopicExists&)
{
- throw ConfigException(propertyName,
- std::string("unable to create topic with the provided configuration :") + mTopicName);
+ //
+ // In case there is a race condition when creating the topic.
+ //
+ mTopic = mTopicManager->retrieve(mTopicName);
}
}
- virtual ~ListenerManagerT()
+ if(!mTopic)
{
- if(mTopic)
- {
- try
- {
- mTopic->destroy();
- }
- catch(...)
- {
- //
- // Destructors are no-throw!
- //
- }
- }
+ throw ConfigException(propertyName,
+ std::string("unable to create topic with the provided configuration :") + mTopicName);
}
+ }
- //
- // NOTE: The current implementation is a little fast and loose here. Inconsistent conditions
- // and whatnot are not flagged.
- //
- void addListener(const T& listener)
+ virtual ~ListenerManagerT()
+ {
+ if(mTopic)
{
- boost::unique_lock<boost::shared_mutex> lock(mLock);
- if(std::find(mListeners.begin(), mListeners.end(), listener) == mListeners.end())
- {
- mListeners.push_back(listener);
- }
- IceStorm::QoS qos;
- qos["reliability"] = "ordered";
try
{
- mTopic->subscribeAndGetPublisher(qos, listener);
+ mTopic->destroy();
}
- catch(const IceStorm::AlreadySubscribed&)
+ catch(...)
{
//
- // This indicates some kind of inconsistent state.
+ // Destructors are no-throw!
//
}
}
+ }
- void removeListener(const T& listener)
+ //
+ // NOTE: The current implementation is a little fast and loose here. Inconsistent conditions
+ // and whatnot are not flagged.
+ //
+ void addListener(const T& listener)
+ {
+ boost::unique_lock<boost::shared_mutex> lock(mLock);
+ if(std::find(mListeners.begin(), mListeners.end(), listener) == mListeners.end())
{
- boost::unique_lock<boost::shared_mutex> lock(mLock);
- typename std::vector<T>::iterator i = std::find(mListeners.begin(), mListeners.end(), listener);
- if(i != mListeners.end())
- {
- mListeners.erase(i);
- mTopic->unsubscribe(listener);
- }
+ mListeners.push_back(listener);
+ }
+ IceStorm::QoS qos;
+ qos["reliability"] = "ordered";
+ try
+ {
+ mTopic->subscribeAndGetPublisher(qos, listener);
}
+ catch(const IceStorm::AlreadySubscribed&)
+ {
+ //
+ // This indicates some kind of inconsistent state.
+ //
+ }
+ }
- std::vector<T> getListeners()
+ void removeListener(const T& listener)
+ {
+ boost::unique_lock<boost::shared_mutex> lock(mLock);
+ typename std::vector<T>::iterator i = std::find(mListeners.begin(), mListeners.end(), listener);
+ if(i != mListeners.end())
{
- boost::shared_lock<boost::shared_mutex> lock(mLock);
- std::vector<T> result(mListeners);
- return result;
+ mListeners.erase(i);
+ mTopic->unsubscribe(listener);
}
+ }
+
+ std::vector<T> getListeners()
+ {
+ boost::shared_lock<boost::shared_mutex> lock(mLock);
+ std::vector<T> result(mListeners);
+ return result;
+ }
- protected:
- boost::shared_mutex mLock;
- Ice::CommunicatorPtr mCommunicator;
- std::string mTopicName;
- IceStorm::TopicPrx mTopic;
- IceStorm::TopicManagerPrx mTopicManager;
- ListenerSeq mListeners;
- };
+protected:
+ boost::shared_mutex mLock;
+ Ice::CommunicatorPtr mCommunicator;
+ std::string mTopicName;
+ IceStorm::TopicPrx mTopic;
+ IceStorm::TopicManagerPrx mTopicManager;
+ ListenerSeq mListeners;
+};
}
}
diff --git a/src/Logger.h b/src/Logger.h
index f2c11d6..e045b41 100644
--- a/src/Logger.h
+++ b/src/Logger.h
@@ -1,53 +1,53 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
#pragma once
#include <iostream>
namespace AsteriskSCF
{
-namespace TestUtil
+namespace TestUtil
{
- //
- // Place holder log stream holder.
- //
- class Logger
+//
+// Place holder log stream holder.
+//
+class Logger
+{
+public:
+ Logger() :
+ mTraceDebug(true)
+ {
+ }
+
+ std::ostream& getTraceStream()
{
- public:
- Logger() :
- mTraceDebug(true)
- {
- }
-
- std::ostream& getTraceStream()
- {
- return std::cerr;
- }
-
- std::ostream& getErrorStream()
- {
- return std::cerr;
- }
-
- std::ostream& getDebugStream()
- {
- return std::cerr;
- }
-
- bool debugTracing() { return mTraceDebug; }
-
- std::ostream& getInfoStream()
- {
- return std::cerr;
- }
-
- private:
- bool mTraceDebug;
- };
+ return std::cerr;
+ }
+
+ std::ostream& getErrorStream()
+ {
+ return std::cerr;
+ }
+
+ std::ostream& getDebugStream()
+ {
+ return std::cerr;
+ }
+
+ bool debugTracing() { return mTraceDebug; }
+
+ std::ostream& getInfoStream()
+ {
+ return std::cerr;
+ }
+
+private:
+ bool mTraceDebug;
+};
} // End of namespace TestUtil
} // End of namespace AsteriskSCF
diff --git a/src/MediaEchoThread.h b/src/MediaEchoThread.h
index 7bba4d3..6fc87fb 100644
--- a/src/MediaEchoThread.h
+++ b/src/MediaEchoThread.h
@@ -1,10 +1,10 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
#pragma once
#include <Ice/Ice.h>
#include <Media/MediaIf.h>
@@ -44,4 +44,4 @@ private:
typedef IceUtil::Handle<MediaEchoThread> MediaEchoThreadPtr;
} /* end of namespace TestUtil */
-} /* end of namespace AsteriskSCF */
+} /* end of namespace AsteriskSCF */
diff --git a/src/MediaSession.cpp b/src/MediaSession.cpp
index d20ca0b..b9e3d3d 100644
--- a/src/MediaSession.cpp
+++ b/src/MediaSession.cpp
@@ -28,11 +28,11 @@ MediaSessionI::MediaSessionI(const std::string& id, const Ice::ObjectAdapterPtr&
{
mSink = new SinkI(mId + "Sink");
mSinks.push_back(AsteriskSCF::Media::V1::StreamSinkPrx::uncheckedCast(mAdapter->add(mSink,
- mAdapter->getCommunicator()->stringToIdentity(mId + "Sink"))));
+ mAdapter->getCommunicator()->stringToIdentity(mId + "Sink"))));
mSource = new SourceI(mId + "Source", mSink);
mSources.push_back(
AsteriskSCF::Media::V1::StreamSourcePrx::uncheckedCast(mAdapter->add(
- mSource, mAdapter->getCommunicator()->stringToIdentity(mId + "Source"))));
+ mSource, mAdapter->getCommunicator()->stringToIdentity(mId + "Source"))));
}
MediaSessionI::~MediaSessionI()
diff --git a/src/MediaSession.h b/src/MediaSession.h
index 191dfa6..c6196e0 100644
--- a/src/MediaSession.h
+++ b/src/MediaSession.h
@@ -1,10 +1,10 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
#pragma once
#include <Ice/Ice.h>
#include <Media/MediaIf.h>
@@ -161,7 +161,7 @@ public:
void echoOn();
void echoOff();
void echo();
-
+
private:
boost::shared_mutex mMutex;
std::string mId;
diff --git a/src/Service.cpp b/src/Service.cpp
index fac1d68..6212ed9 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -21,7 +21,7 @@
#include "Logger.h"
#include "TestEndpoint.h"
-namespace
+namespace
{
class TestChannelDriver : public IceBox::Service
{
@@ -50,7 +50,7 @@ void TestChannelDriver::start(const std::string& name, const Ice::CommunicatorPt
mAdapter->activate();
AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr servant = AsteriskSCF::TestUtil::TestEndpoint::create(mAdapter, "TestChannel.Locator");
- AsteriskSCF::Core::Routing::V1::EndpointLocatorPrx endpointLocatorPrx =
+ AsteriskSCF::Core::Routing::V1::EndpointLocatorPrx endpointLocatorPrx =
AsteriskSCF::Core::Routing::V1::EndpointLocatorPrx::checkedCast(mAdapter->add(servant, communicator->stringToIdentity("TestChannel")));
AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagementPrx management = AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagementPrx::checkedCast(communicator->propertyToProxy("ServiceLocatorManagementProxy"));
@@ -81,8 +81,8 @@ void TestChannelDriver::stop()
}
extern "C" {
- ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
- {
- return new TestChannelDriver;
- }
+ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
+{
+ return new TestChannelDriver;
+}
}
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 9c864b4..630ea70 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -33,7 +33,7 @@
using namespace AsteriskSCF::TestUtil;
-namespace
+namespace
{
//
@@ -110,7 +110,7 @@ public:
{
mSession = prx;
}
-
+
protected:
AsteriskSCF::SessionCommunications::V1::SessionListenerPrx mPublisher;
AsteriskSCF::SessionCommunications::V1::SessionPrx mSession;
@@ -126,7 +126,7 @@ class SessionI : public AsteriskSCF::SessionCommunications::V1::Session
{
public:
SessionI(const InternalManagerPtr& m, const AsteriskSCF::SessionCommunications::V1::SessionEndpointPrx& prx, const std::string& id,
- const Ice::ObjectAdapterPtr& adapter) :
+ const Ice::ObjectAdapterPtr& adapter) :
mEndpointManager(m),
mEndpointPrx(prx),
mId(id),
@@ -138,7 +138,7 @@ public:
AsteriskSCF::SessionCommunications::V1::SessionInfoPtr addListener(
const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
- const Ice::Current&)
+ const Ice::Current&)
{
mListeners->addListener(listener);
mEndpointManager->log(mId, __FUNCTION__);
@@ -175,7 +175,7 @@ public:
{
mMediaSession = AsteriskSCF::Media::V1::SessionPrx::uncheckedCast(
current.adapter->add(new MediaSessionI(mId + "Media", current.adapter),
- current.adapter->getCommunicator()->stringToIdentity(mId + "Media")));
+ current.adapter->getCommunicator()->stringToIdentity(mId + "Media")));
}
return mMediaSession;
};
@@ -191,7 +191,7 @@ public:
}
void removeListener(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
- const Ice::Current&)
+ const Ice::Current&)
{
mListeners->removeListener(listener);
mEndpointManager->log(mId, __FUNCTION__);
@@ -201,17 +201,17 @@ public:
{
mEndpointManager->log(mId, __FUNCTION__);
}
-
+
void start(const Ice::Current&)
{
mEndpointManager->log(mId, __FUNCTION__);
}
-
+
void stop(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response, const Ice::Current&)
{
mEndpointManager->log(mId, __FUNCTION__);
}
-
+
void unhold(const Ice::Current&)
{
mEndpointManager->log(mId, __FUNCTION__);
@@ -224,7 +224,7 @@ public:
}
AsteriskSCF::SessionCommunications::V1::SessionInfoPtr setBridge(const AsteriskSCF::SessionCommunications::V1::BridgePrx& newBridge,
- const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
+ const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
mCurrentBridge = newBridge;
@@ -233,7 +233,7 @@ public:
return mInfo;
}
- void removeBridge(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
+ void removeBridge(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
if(!mCurrentBridge)
@@ -249,7 +249,7 @@ public:
{
mMediaServant->echo();
}
-
+
void echoOn()
{
mMediaServant->echoOn();
@@ -294,9 +294,9 @@ private:
typedef IceUtil::Handle<SessionI> SessionIPtr;
class EndpointManager :
- virtual public IceUtil::Shared,
- virtual public InternalManagerIf,
- virtual public AsteriskSCF::SessionCommunications::V1::SessionEndpoint
+ virtual public IceUtil::Shared,
+ virtual public InternalManagerIf,
+ virtual public AsteriskSCF::SessionCommunications::V1::SessionEndpoint
{
public:
@@ -308,14 +308,14 @@ public:
AsteriskSCF::SessionCommunications::V1::SessionPrx createSession(
const std::string& destination,
- const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
- const Ice::Current& current)
+ const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
+ const Ice::Current& current)
{
InternalSessionInfo info;
info.id = mId + "." + destination + "." + IceUtil::generateUUID();
info.servant = new SessionI(this,
- AsteriskSCF::SessionCommunications::V1::SessionEndpointPrx::checkedCast(current.adapter->createProxy(current.id)),
- info.id, current.adapter);
+ AsteriskSCF::SessionCommunications::V1::SessionEndpointPrx::checkedCast(current.adapter->createProxy(current.id)),
+ info.id, current.adapter);
info.session = AsteriskSCF::SessionCommunications::V1::SessionPrx::checkedCast(current.adapter->add(info.servant, current.adapter->getCommunicator()->stringToIdentity(info.id)));
info.servant->setProxy(info.session);
boost::unique_lock<boost::shared_mutex> lock(mMutex);
@@ -361,7 +361,7 @@ public:
}
std::cerr << "Unknown id" << std::endl;
}
-
+
void echoOn(const std::string& id)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
@@ -397,7 +397,7 @@ public:
}
std::cerr << "Unknown id" << std::endl;
}
-
+
void hangup(const std::string& id)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
@@ -421,7 +421,7 @@ public:
}
std::cerr << "Unknown id" << std::endl;
}
-
+
void getlog(const std::string& id, std::vector<std::string>& log)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
@@ -476,7 +476,7 @@ public:
{
mMgr->echo(id);
}
-
+
void echoOn(const std::string& id, const Ice::Current&)
{
mMgr->echoOn(id);
@@ -491,7 +491,7 @@ public:
{
mMgr->answer(id);
}
-
+
void hangup(const std::string& id, const Ice::Current&)
{
mMgr->hangup(id);
@@ -501,7 +501,7 @@ public:
{
mMgr->die(id);
}
-
+
void getlog(const std::string& id, std::vector<std::string>& log, const Ice::Current&)
{
mMgr->getlog(id, log);
@@ -556,7 +556,7 @@ typedef IceUtil::Handle<EndpointLocatorI> EndpointLocatorIPtr;
AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr TestEndpoint::create(const Ice::ObjectAdapterPtr& adapter, const std::string& id)
{
-
+
EndpointLocatorIPtr impl(new EndpointLocatorI(adapter, id));
return AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr::dynamicCast(impl);
}
diff --git a/src/TestEndpoint.h b/src/TestEndpoint.h
index c6ece4d..3ff36ab 100644
--- a/src/TestEndpoint.h
+++ b/src/TestEndpoint.h
@@ -24,17 +24,17 @@ namespace AsteriskSCF
{
namespace TestUtil
{
+//
+// For the moment basically a factory that creates
+class TestEndpoint
+{
+ //
+ // TestEndpoint currently doesn't support any instance specific
+ // functionality so creating an instance of it is pointless.
//
- // For the moment basically a factory that creates
- class TestEndpoint
- {
- //
- // TestEndpoint currently doesn't support any instance specific
- // functionality so creating an instance of it is pointless.
- //
- TestEndpoint() {}
- public:
- static AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr create(const Ice::ObjectAdapterPtr& adapter, const std::string& id);
- };
+ TestEndpoint() {}
+public:
+ static AsteriskSCF::Core::Routing::V1::EndpointLocatorPtr create(const Ice::ObjectAdapterPtr& adapter, const std::string& id);
+};
}
} // End of namespace AsteriskSCF
diff --git a/src/main.cpp b/src/main.cpp
index 99fa830..5eaf952 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,12 +18,12 @@
#include "ConsoleDriver.h"
#include <iostream>
-namespace
+namespace
{
class ConsoleApp : public Ice::Application
{
public:
- ConsoleApp()
+ ConsoleApp()
{
}
@@ -40,7 +40,7 @@ int ConsoleApp::run(int, char**)
{
callbackOnInterrupt();
- AsteriskSCF::TestChannel::V1::CommandsPrx commandIf =
+ AsteriskSCF::TestChannel::V1::CommandsPrx commandIf =
AsteriskSCF::TestChannel::V1::CommandsPrx::checkedCast(communicator()->propertyToProxy("TestCommands.Proxy"));
if(!commandIf)
{
commit 1c37794f2e602a951d0ef2d797f96638c99cd6f1
Author: Ken Hunt <ken.hunt at digium.com>
Date: Sun Oct 24 23:41:55 2010 -0500
Updated copyright header to GPL V2.
diff --git a/local_slice/CommandsIf.ice b/local_slice/CommandsIf.ice
index 598bf90..1c17ded 100644
--- a/local_slice/CommandsIf.ice
+++ b/local_slice/CommandsIf.ice
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#pragma once
diff --git a/slice b/slice
index 7e63131..03ea08a 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 7e63131ea251461c0f4a4d751841601b107452bd
+Subproject commit 03ea08a0f749b5f36ae4dc36d25493689f9e273c
diff --git a/src/ConsoleDriver.cpp b/src/ConsoleDriver.cpp
index 622ac10..10a7980 100644
--- a/src/ConsoleDriver.cpp
+++ b/src/ConsoleDriver.cpp
@@ -1,10 +1,18 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2010, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
#include <iostream>
#include <IceUtil/Thread.h>
diff --git a/src/ConsoleDriver.h b/src/ConsoleDriver.h
index 178ad24..605e876 100644
--- a/src/ConsoleDriver.h
+++ b/src/ConsoleDriver.h
@@ -1,10 +1,18 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2010, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
#pragma once
#include <IceUtil/Monitor.h>
diff --git a/src/MediaEchoThread.cpp b/src/MediaEchoThread.cpp
index 7aa8217..c9eccf1 100644
--- a/src/MediaEchoThread.cpp
+++ b/src/MediaEchoThread.cpp
@@ -1,10 +1,18 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2010, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
#include "MediaEchoThread.h"
using namespace AsteriskSCF::TestUtil;
diff --git a/src/MediaSession.cpp b/src/MediaSession.cpp
index 2539ffd..d20ca0b 100644
--- a/src/MediaSession.cpp
+++ b/src/MediaSession.cpp
@@ -1,10 +1,18 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2010, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
#include "MediaSession.h"
using namespace AsteriskSCF::TestUtil;
diff --git a/src/Service.cpp b/src/Service.cpp
index 1b623ca..fac1d68 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -1,10 +1,18 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2010, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
#include <Ice/Ice.h>
#include <IceBox/IceBox.h>
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index c4db008..9c864b4 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -1,10 +1,18 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2010, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
#include "TestEndpoint.h"
#include "ListenerManager.h"
diff --git a/src/TestEndpoint.h b/src/TestEndpoint.h
index f59680a..c6ece4d 100644
--- a/src/TestEndpoint.h
+++ b/src/TestEndpoint.h
@@ -1,10 +1,18 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2010, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
#pragma once
#include <Core/Endpoint/EndpointIf.h>
diff --git a/src/main.cpp b/src/main.cpp
index dbf4e94..99fa830 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,10 +1,18 @@
/*
-* Asterisk Scalable Communications Framework
-*
-* Copyright (C) 2010 -- Digium, Inc.
-*
-* All rights reserved.
-*/
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2010, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
#include <Ice/Ice.h>
#include "ConsoleDriver.h"
commit f43cb9de5f76805e1936832f08211afea0a77be5
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Sun Oct 24 21:58:43 2010 -0400
clean up license file
diff --git a/LICENSE.txt b/LICENSE.txt
index 4d5fc3e..ff0499c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,68 +1,71 @@
-Asterisk SCF is distributed by Digium, Inc. (Digium) under the
-GNU General Public License version 2 (GPLv2) and is also available under
-alternative licenses negotiated directly with Digium. If you obtained
-Asterisk SCF under the GPLv2, then those terms apply to all programs
-you distribute that communicate using the Asterisk SCF object interfaces
-(APIs) on objects provided by Asterisk SCF’s components, as defined below.
-A copy of the GPLv2 is included in the Asterisk SCF source tree in the
-file COPYING.txt
+Asterisk SCF is distributed by Digium, Inc. (Digium) under the GNU
+General Public License version 2 (GPLv2) and is also available under
+alternative licenses negotiated directly with Digium. If you obtained
+Asterisk SCF under the GPLv2, then those terms apply to all programs
+you distribute that communicate using the Asterisk SCF object
+interfaces (APIs) on objects provided by Asterisk SCF's components, as
+defined below. A copy of the GPLv2 is included in the Asterisk SCF
+source tree in the file COPYING.txt.
-Asterisk SCF is a collection of programs that communicate with each other
-over defined APIs. This communication can occur within a single process
-(if two programs are loaded into a suitable container), between processes
-on a single machine, between processes on different machines, or some
-combination. In addition, these APIs are usable across a number of
-platforms and also across a variety of programming languages, many of
-which are interpreted (scripting) languages. Because of this flexibility
-and the possible ambiguity in interpretation of the provisions of the
-GPLv2 as they apply to Asterisk SCF, Digium makes the following
-statement:
+Asterisk SCF is a collection of programs that communicate with each
+other over defined APIs. This communication can occur within a single
+process (if two programs are loaded into a suitable container),
+between processes on a single machine, between processes on different
+machines, or some combination. In addition, these APIs are usable
+across a number of platforms and also across a variety of programming
+languages, many of which are interpreted (scripting)
+languages. Because of this flexibility and the possible ambiguity in
+interpretation of the provisions of the GPLv2 as they apply to
+Asterisk SCF, Digium makes the following statement:
- It is Digium’s interpretation that because the Asterisk SCF APIs,
- by definition, expose direct, and indirect, complex remote, and non-remote,
- function calls on objects provided by Asterisk SCF’s programs, that usage
- of these APIs between the program hosting the object(s) and the program
- accessing the object(s) creates a derivative work that must be covered
- wholly by GPLv2, even if the mechanism used to invoke the function calls
- employs a cross-process or network connection. As a result, any program
- that employs the Asterisk SCF APIs to perform its intended functions,
- and would not be able to perform those intended functions without using
- these APIs to communicate with Asterisk SCF programs, or derivatives of
- Asterisk SCF programs, is subject to the terms of the GPLv2 when it is
- distributed, unless the distributor of the program has obtained explicit
- written permission from Digium to distribute it under a different
- license.
+ It is Digium's interpretation that because the Asterisk SCF APIs,
+ by definition, expose direct, and indirect, complex remote, and
+ non-remote, function calls on objects provided by Asterisk SCF's
+ programs, that usage of these APIs between the program hosting the
+ object(s) and the program accessing the object(s) creates a
+ derivative work that must be covered wholly by GPLv2, even if the
+ mechanism used to invoke the function calls employs a
+ cross-process or network connection. As a result, any program that
+ employs the Asterisk SCF APIs to perform its intended functions,
+ and would not be able to perform those intended functions without
+ using these APIs to communicate with Asterisk SCF programs, or
+ derivatives of Asterisk SCF programs, is subject to the terms of
+ the GPLv2 when it is distributed, unless the distributor of the
+ program has obtained explicit written permission from Digium to
+ distribute it under a different license.
-Digium is able to grant, at its sole discretion, permission for companies,
-individuals or organizations to distribute programs that use the
-Asterisk SCF APIs under open source or proprietary terms. Digium is able
-to do this because all components of the Asterisk SCF package are either
-copyrighted by Digium, because Digium has been granted a sufficient license
-by the component’s copyright holder(s), or some combination thereof.
+Digium is able to grant, at its sole discretion, permission for
+companies, individuals or organizations to distribute programs that
+use the Asterisk SCF APIs under open source or proprietary
+terms. Digium is able to do this because all components of the
+Asterisk SCF package are either copyrighted by Digium, because Digium
+has been granted a sufficient license by the component's copyright
+holder(s), or some combination thereof.
-Digium grants specific permission for anyone to distribute programs that
-use the Asterisk SCF APIs and also use the OpenSSL toolkit,
-Ice (Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit
-(“Open Source Exceptions”), even though the terms of the GPLv2 do not allow
-such distribution. This permission only extends to distributions that
-properly acknowledge and comply with the terms of the licenses on the
-Open Source Exceptions that are used in addition to the terms of
+Digium grants specific permission for anyone to distribute programs
+that use the Asterisk SCF APIs and also use the OpenSSL toolkit, Ice
+(Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit
+("Open Source Exceptions"), even though the terms of the GPLv2 do not
+allow such distribution. This permission only extends to distributions
+that properly acknowledge and comply with the terms of the licenses on
+the Open Source Exceptions that are used in addition to the terms of
the GPLv2.
-If you wish to use Asterisk SCF code in other GPLv2 programs, there is
-no requirement that you provide the same permissions for these
-Open Source Exceptions to recipients of your programs (although if you
-have written a program for Asterisk SCF, Digium would strongly encourage
+If you wish to use Asterisk SCF code in other GPLv2 programs, there is
+no requirement that you provide the same permissions for these Open
+Source Exceptions to recipients of your programs (although if you have
+written a program for Asterisk SCF, Digium would strongly encourage
you to grant the same permissions granted by Digium).
-The ‘Ice’ and ‘ZeroC’ names are trademarks of ZeroC, Inc.
+The 'Ice' and 'ZeroC' names are trademarks of ZeroC, Inc.
-The “Asterisk SCF” name and logos are trademarks owned by Digium and use
-of them is subject to Digium’s trademark licensing policies. If you wish
-to use these trademarks for purposes other than unmodified redistribution
-of Asterisk SCF source code obtained from Digium, you should contact
-Digium’s licensing department to determine the necessary steps you must
-take. For more information on this policy, please read:
+The "Asterisk SCF" name and logos are trademarks owned by Digium and
+use of them is subject to Digium's trademark licensing policies. If
+you wish to use these trademarks for purposes other than unmodified
+redistribution of Asterisk SCF source code obtained from Digium, you
+should contact Digium's licensing department to determine the
+necessary steps you must take. For more information on this policy,
+please read:
http://www.digium.com/en/company/profile/trademarkpolicy.php
@@ -72,9 +75,10 @@ If you have any questions regarding our licensing policy, please contact us:
+1.256.428.6000 (via telephone outside the USA)
+1.256.864.0464 (via FAX inside or outside the USA)
IAX2/pbx.digium.com (via IAX2)
+sip:6000 at digium.com (via SIP)
licensing at digium.com (via email)
Digium, Inc.
445 Jan Davis Drive NW
Huntsville, AL 35806
-USA
\ No newline at end of file
+USA
commit 502ebb491fb7286137f9bce86a012aa3ca9d3b80
Author: Ken Hunt <ken.hunt at digium.com>
Date: Sun Oct 24 19:57:18 2010 -0500
Added COPYING and LICENSE text files.
diff --git a/COPYING.txt b/COPYING.txt
new file mode 100644
index 0000000..cf87abb
--- /dev/null
+++ b/COPYING.txt
@@ -0,0 +1,340 @@
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..4d5fc3e
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,80 @@
+Asterisk SCF is distributed by Digium, Inc. (Digium) under the
+GNU General Public License version 2 (GPLv2) and is also available under
+alternative licenses negotiated directly with Digium. If you obtained
+Asterisk SCF under the GPLv2, then those terms apply to all programs
+you distribute that communicate using the Asterisk SCF object interfaces
+(APIs) on objects provided by Asterisk SCF’s components, as defined below.
+A copy of the GPLv2 is included in the Asterisk SCF source tree in the
+file COPYING.txt
+
+Asterisk SCF is a collection of programs that communicate with each other
+over defined APIs. This communication can occur within a single process
+(if two programs are loaded into a suitable container), between processes
+on a single machine, between processes on different machines, or some
+combination. In addition, these APIs are usable across a number of
+platforms and also across a variety of programming languages, many of
+which are interpreted (scripting) languages. Because of this flexibility
+and the possible ambiguity in interpretation of the provisions of the
+GPLv2 as they apply to Asterisk SCF, Digium makes the following
+statement:
+
+ It is Digium’s interpretation that because the Asterisk SCF APIs,
+ by definition, expose direct, and indirect, complex remote, and non-remote,
+ function calls on objects provided by Asterisk SCF’s programs, that usage
+ of these APIs between the program hosting the object(s) and the program
+ accessing the object(s) creates a derivative work that must be covered
+ wholly by GPLv2, even if the mechanism used to invoke the function calls
+ employs a cross-process or network connection. As a result, any program
+ that employs the Asterisk SCF APIs to perform its intended functions,
+ and would not be able to perform those intended functions without using
+ these APIs to communicate with Asterisk SCF programs, or derivatives of
+ Asterisk SCF programs, is subject to the terms of the GPLv2 when it is
+ distributed, unless the distributor of the program has obtained explicit
+ written permission from Digium to distribute it under a different
+ license.
+
+Digium is able to grant, at its sole discretion, permission for companies,
+individuals or organizations to distribute programs that use the
+Asterisk SCF APIs under open source or proprietary terms. Digium is able
+to do this because all components of the Asterisk SCF package are either
+copyrighted by Digium, because Digium has been granted a sufficient license
+by the component’s copyright holder(s), or some combination thereof.
+
+Digium grants specific permission for anyone to distribute programs that
+use the Asterisk SCF APIs and also use the OpenSSL toolkit,
+Ice (Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit
+(“Open Source Exceptions”), even though the terms of the GPLv2 do not allow
+such distribution. This permission only extends to distributions that
+properly acknowledge and comply with the terms of the licenses on the
+Open Source Exceptions that are used in addition to the terms of
+the GPLv2.
+
+If you wish to use Asterisk SCF code in other GPLv2 programs, there is
+no requirement that you provide the same permissions for these
+Open Source Exceptions to recipients of your programs (although if you
+have written a program for Asterisk SCF, Digium would strongly encourage
+you to grant the same permissions granted by Digium).
+
+The ‘Ice’ and ‘ZeroC’ names are trademarks of ZeroC, Inc.
+
+The “Asterisk SCF” name and logos are trademarks owned by Digium and use
+of them is subject to Digium’s trademark licensing policies. If you wish
+to use these trademarks for purposes other than unmodified redistribution
+of Asterisk SCF source code obtained from Digium, you should contact
+Digium’s licensing department to determine the necessary steps you must
+take. For more information on this policy, please read:
+
+http://www.digium.com/en/company/profile/trademarkpolicy.php
+
+If you have any questions regarding our licensing policy, please contact us:
+
++1.877.344.4861 (via telephone in the USA)
++1.256.428.6000 (via telephone outside the USA)
++1.256.864.0464 (via FAX inside or outside the USA)
+IAX2/pbx.digium.com (via IAX2)
+licensing at digium.com (via email)
+
+Digium, Inc.
+445 Jan Davis Drive NW
+Huntsville, AL 35806
+USA
\ No newline at end of file
commit 7f984e0257e242f370977680a013cd44cb84b178
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Oct 15 11:16:21 2010 -0500
Replaced old project working title in config files.
diff --git a/config/test_channel.conf b/config/test_channel.conf
index d1e7bcd..bead0c4 100644
--- a/config/test_channel.conf
+++ b/config/test_channel.conf
@@ -1,8 +1,8 @@
IceBox.InheritProperties=1
-HydraIceStorm.InstanceName=HydraIceStorm
-HydraIceStorm.TopicManager.Endpoints=default -p 55555
-HydraIceStorm.Publish.Endpoints=default -p 55556
-HydraIceStorm.Transient=1
+AsteriskSCFIceStorm.InstanceName=AsteriskSCFIceStorm
+AsteriskSCFIceStorm.TopicManager.Endpoints=default -p 55555
+AsteriskSCFIceStorm.Publish.Endpoints=default -p 55556
+AsteriskSCFIceStorm.Transient=1
LoggerAdapter.Endpoints=default
AsteriskSCF.LoggingService.Endpoints=default
@@ -16,7 +16,7 @@ ServiceLocatorAdapter.Endpoints=tcp -p 55558
ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 55557
-TopicManager.Proxy=HydraIceStorm/TopicManager:default -p 55555
+TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 55555
IceBox.Service.Logger=logging-service:createLoggingService
IceBox.Service.TestServiceLocator=service_locator:create
commit a8bcab4482bc3f079988b12f5ee78aa2a512b517
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Oct 14 18:30:10 2010 -0500
Replacing references to project's old internal working name.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b76275e..6b032c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,11 +5,11 @@ if(NOT integrated_build STREQUAL "true")
# Minimum we require is 2.6, any lower and stuff would fail horribly
cmake_minimum_required(VERSION 2.6)
- # Include common Hydra build infrastructure
+ # Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
# This project is C++ based and requires a minimum of 3.4
- hydra_project("Test Channel" 3.4 CXX)
+ asterisk_scf_project("Test Channel" 3.4 CXX)
# Take care of slice definitions
add_subdirectory(slice EXCLUDE_FROM_ALL)
diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index ba8b52c..a1ed80b 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -1 +1 @@
-hydra_compile_slice(CommandsIf.ice lib "Test Channel Command API" TestChannel)
+asterisk_scf_compile_slice(CommandsIf.ice lib "Test Channel Command API" TestChannel)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 55fabc9..33d3155 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,23 +1,23 @@
-hydra_component_init(test_channel CXX)
-hydra_component_add_slice(test_channel EndpointIf)
-hydra_component_add_slice(test_channel ComponentServiceIf)
-hydra_component_add_slice(test_channel SessionCommunicationsIf)
-hydra_component_add_slice(test_channel RoutingIf)
-hydra_component_add_slice(test_channel CommandsIf)
-hydra_component_add_file(test_channel Service.cpp)
-hydra_component_add_file(test_channel MediaEchoThread.cpp)
-hydra_component_add_file(test_channel MediaSession.cpp)
-hydra_component_add_file(test_channel TestEndpoint.cpp)
-hydra_component_add_file(test_channel TestEndpoint.h)
-hydra_component_add_ice_libraries(test_channel IceStorm)
-hydra_component_add_boost_libraries(test_channel thread)
-hydra_component_add_boost_libraries(test_channel date_time)
-hydra_component_build_icebox(test_channel)
+asterisk_scf_component_init(test_channel CXX)
+asterisk_scf_component_add_slice(test_channel EndpointIf)
+asterisk_scf_component_add_slice(test_channel ComponentServiceIf)
+asterisk_scf_component_add_slice(test_channel SessionCommunicationsIf)
+asterisk_scf_component_add_slice(test_channel RoutingIf)
+asterisk_scf_component_add_slice(test_channel CommandsIf)
+asterisk_scf_component_add_file(test_channel Service.cpp)
+asterisk_scf_component_add_file(test_channel MediaEchoThread.cpp)
+asterisk_scf_component_add_file(test_channel MediaSession.cpp)
+asterisk_scf_component_add_file(test_channel TestEndpoint.cpp)
+asterisk_scf_component_add_file(test_channel TestEndpoint.h)
+asterisk_scf_component_add_ice_libraries(test_channel IceStorm)
+asterisk_scf_component_add_boost_libraries(test_channel thread)
+asterisk_scf_component_add_boost_libraries(test_channel date_time)
+asterisk_scf_component_build_icebox(test_channel)
-hydra_component_init(console_driver CXX)
-hydra_component_add_slice(console_driver CommandsIf)
-hydra_component_add_file(console_driver ConsoleDriver.cpp)
-hydra_component_add_file(console_driver ConsoleDriver.h)
-hydra_component_add_file(console_driver main.cpp)
-hydra_component_build_standalone(console_driver)
+asterisk_scf_component_init(console_driver CXX)
+asterisk_scf_component_add_slice(console_driver CommandsIf)
+asterisk_scf_component_add_file(console_driver ConsoleDriver.cpp)
+asterisk_scf_component_add_file(console_driver ConsoleDriver.h)
+asterisk_scf_component_add_file(console_driver main.cpp)
+asterisk_scf_component_build_standalone(console_driver)
diff --git a/src/Service.cpp b/src/Service.cpp
index c5217a2..1b623ca 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -73,7 +73,7 @@ void TestChannelDriver::stop()
}
extern "C" {
- HYDRA_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
{
return new TestChannelDriver;
}
commit 732ef0fa29bd33d0aca4835a49be919b2736b399
Author: Brent Eagles <beagles at digium.com>
Date: Wed Oct 13 16:12:24 2010 -0230
Fix bug where listeners weren't being registered with IceStorm
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 39f9e64..c4db008 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -132,6 +132,7 @@ public:
const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
const Ice::Current&)
{
+ mListeners->addListener(listener);
mEndpointManager->log(mId, __FUNCTION__);
return mInfo;
}
@@ -184,6 +185,7 @@ public:
void removeListener(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
const Ice::Current&)
{
+ mListeners->removeListener(listener);
mEndpointManager->log(mId, __FUNCTION__);
}
@@ -218,6 +220,7 @@ public:
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
mCurrentBridge = newBridge;
+ mListeners->addListener(listener);
mEndpointManager->log(mId, __FUNCTION__);
return mInfo;
}
@@ -229,6 +232,7 @@ public:
{
throw AsteriskSCF::SessionCommunications::V1::NotBridged();
}
+ mListeners->removeListener(listener);
mCurrentBridge = 0;
mEndpointManager->log(mId, __FUNCTION__);
}
commit 9705e7d70b3721a3aeccd8ada97181242c7f1098
Author: Brent Eagles <beagles at digium.com>
Date: Tue Oct 12 11:23:51 2010 -0230
Fix typo in condition check.
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index df0917c..39f9e64 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -225,7 +225,7 @@ public:
void removeBridge(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
{
boost::unique_lock<boost::shared_mutex> lock(mMutex);
- if(mCurrentBridge)
+ if(!mCurrentBridge)
{
throw AsteriskSCF::SessionCommunications::V1::NotBridged();
}
commit edee2184a6fcf5064f2bfd6abc0d339ecb8993b5
Author: Brent Eagles <beagles at digium.com>
Date: Tue Oct 12 11:17:30 2010 -0230
Updating the test session manager to comply with latest slice changes
diff --git a/slice b/slice
index 03ea08a..7e63131 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 03ea08a0f749b5f36ae4dc36d25493689f9e273c
+Subproject commit 7e63131ea251461c0f4a4d751841601b107452bd
diff --git a/src/Service.cpp b/src/Service.cpp
index 6463ffd..c5217a2 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -55,7 +55,21 @@ void TestChannelDriver::start(const std::string& name, const Ice::CommunicatorPt
void TestChannelDriver::stop()
{
mServiceManagement->unregister();
- mAdapter->deactivate();
+ try
+ {
+ mAdapter->deactivate();
+ mAdapter->waitForDeactivate();
+ }
+ catch(...)
+ {
+ }
+ try
+ {
+ mAdapter->destroy();
+ }
+ catch(...)
+ {
+ }
}
extern "C" {
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index d90d487..df0917c 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -207,6 +207,32 @@ public:
mEndpointManager->log(mId, __FUNCTION__);
}
+ AsteriskSCF::SessionCommunications::V1::BridgePrx getBridge(const Ice::Current&)
+ {
+ mEndpointManager->log(mId, __FUNCTION__);
+ return mCurrentBridge;
+ }
+
+ AsteriskSCF::SessionCommunications::V1::SessionInfoPtr setBridge(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;
+ mEndpointManager->log(mId, __FUNCTION__);
+ return mInfo;
+ }
+
+ void removeBridge(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&)
+ {
+ boost::unique_lock<boost::shared_mutex> lock(mMutex);
... 4170 lines suppressed ...
--
team/ken.hunt/route_async_test_channel.git
More information about the asterisk-scf-commits
mailing list