[asterisk-scf-commits] asterisk-scf/integration/routing.git branch "oneshot-hooks" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Jul 25 17:57:17 CDT 2011
branch "oneshot-hooks" has been created
at 0df913b004e3b9493bad4b20bd729fa34d7cb032 (commit)
- Log -----------------------------------------------------------------
commit 0df913b004e3b9493bad4b20bd729fa34d7cb032
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon Jul 25 15:59:57 2011 -0500
Make changes to satisfy new slice API for having one-shot hooks.
diff --git a/slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice b/slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice
index 507444c..2e0f2ac 100644
--- a/slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice
@@ -19,6 +19,7 @@
#include <Ice/Identity.ice>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice>
#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice>
module AsteriskSCF
{
@@ -105,6 +106,7 @@ module V1
{
AsteriskSCF::SessionCommunications::V1::Session *source;
string destination;
+ AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* hook;
};
const string RouteSessionOpStartKeyMod = ".START";
diff --git a/src/ConnectBridgedSessionsWithDestinationOperation.cpp b/src/ConnectBridgedSessionsWithDestinationOperation.cpp
index 449d36c..95b51bd 100644
--- a/src/ConnectBridgedSessionsWithDestinationOperation.cpp
+++ b/src/ConnectBridgedSessionsWithDestinationOperation.cpp
@@ -210,6 +210,7 @@ ConnectBridgedSessionsWithDestinationOperation::ConnectBridgedSessionsWithDestin
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionToReplace,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener)
@@ -221,7 +222,8 @@ ConnectBridgedSessionsWithDestinationOperation::ConnectBridgedSessionsWithDestin
ConnectBridgedSessionsWithDestinationOp::STATE_LOOKUP,
operationId),
mSessionToReplace(sessionToReplace),
- mDestination(destination)
+ mDestination(destination),
+ mHook(oneShotHook)
{
initStateMachine();
}
@@ -234,6 +236,7 @@ ConnectBridgedSessionsWithDestinationOperationPtr ConnectBridgedSessionsWithDest
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionToReplace,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener)
@@ -243,6 +246,7 @@ ConnectBridgedSessionsWithDestinationOperationPtr ConnectBridgedSessionsWithDest
operationId,
sessionToReplace,
destination,
+ oneShotHook,
current,
context,
listener) );
@@ -442,7 +446,7 @@ void ConnectBridgedSessionsWithDestinationOperation::establishBridgeState()
}
// Add a session
- SessionSeq newSessions = createSessionForEndpoints(mLookupResult, mDestination, mListenerManager);
+ SessionSeq newSessions = createSessionForEndpoints(mLookupResult, mDestination, mHook, mListenerManager);
if (mListenerManager->getListener()->getNumSessions() < 2)
{
diff --git a/src/ConnectBridgedSessionsWithDestinationOperation.h b/src/ConnectBridgedSessionsWithDestinationOperation.h
index c7a142f..988ab96 100644
--- a/src/ConnectBridgedSessionsWithDestinationOperation.h
+++ b/src/ConnectBridgedSessionsWithDestinationOperation.h
@@ -71,6 +71,7 @@ public:
const std::string& operationId,
const AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionToReplace,
const std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener);
@@ -111,6 +112,7 @@ protected:
const std::string& operationId,
const AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionToReplace,
const std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener);
@@ -165,6 +167,7 @@ private:
// Operation input params.
AsteriskSCF::SessionCommunications::V1::SessionPrx mSessionToReplace;
std::string mDestination;
+ AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx mHook;
::Ice::Current mIceCurrent;
// Implementation state
diff --git a/src/RouteSessionOperation.cpp b/src/RouteSessionOperation.cpp
index d8d25da..aa2a8b3 100644
--- a/src/RouteSessionOperation.cpp
+++ b/src/RouteSessionOperation.cpp
@@ -213,6 +213,7 @@ RouteSessionOperation::RouteSessionOperation(const AMD_SessionRouter_routeSessio
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener)
@@ -224,7 +225,8 @@ RouteSessionOperation::RouteSessionOperation(const AMD_SessionRouter_routeSessio
RouteSessionOp::STATE_LOOKUP,
operationId),
mSource(source),
- mDestination(destination)
+ mDestination(destination),
+ mHook(oneShotHook)
{
initStateMachine();
}
@@ -236,6 +238,7 @@ RouteSessionOperationPtr RouteSessionOperation::create(const AMD_SessionRouter_r
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener)
@@ -245,6 +248,7 @@ RouteSessionOperationPtr RouteSessionOperation::create(const AMD_SessionRouter_r
operationId,
source,
destination,
+ oneShotHook,
current,
context,
listener));
@@ -301,6 +305,7 @@ void RouteSessionOperation::reflectUpdate(const AsteriskSCF::Replication::BasicR
{
mSource = item->source;
mDestination = item->destination;
+ mHook = item->hook;
mOperationId = item->operationId;
mReplicatedStates.push_back(RouteSessionOp::STATE_LOOKUP);
@@ -460,7 +465,7 @@ void RouteSessionOperation::establishBridgeState()
}
// Add a session to the endpoints.
- SessionSeq newSessions = createSessionForEndpoints(mLookupResult, mDestination, mListenerManager);
+ SessionSeq newSessions = createSessionForEndpoints(mLookupResult, mDestination, mHook, mListenerManager);
if (mListenerManager->getListener()->getNumSessions() < 2)
{
diff --git a/src/RouteSessionOperation.h b/src/RouteSessionOperation.h
index b5ce75c..8ab5f63 100644
--- a/src/RouteSessionOperation.h
+++ b/src/RouteSessionOperation.h
@@ -69,6 +69,7 @@ public:
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener);
@@ -103,6 +104,7 @@ protected:
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener);
@@ -173,6 +175,7 @@ private:
AsteriskSCF::SessionCommunications::V1::SessionPrx mSource;
AsteriskSCF::SessionCommunications::V1::BridgePrx mBridge;
std::string mDestination;
+ AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx mHook;
std::vector<RouteSessionOp::OperationState> mReplicatedStates;
}; // class RouteSessionOperation
diff --git a/src/SessionRouter.cpp b/src/SessionRouter.cpp
index a291f47..8c9962f 100644
--- a/src/SessionRouter.cpp
+++ b/src/SessionRouter.cpp
@@ -163,6 +163,7 @@ void SessionRouter::routeSession_async(const ::AsteriskSCF::SessionCommunication
const ::std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current)
{
// Check the cache for a replica with this transaction Id.
@@ -180,6 +181,7 @@ void SessionRouter::routeSession_async(const ::AsteriskSCF::SessionCommunication
operationId,
source,
destination,
+ oneShotHook,
current,
mImpl->mSessionContext,
mImpl.get()));
@@ -201,6 +203,7 @@ void SessionRouter::connectBridgedSessionsWithDestination_async(const ::Asterisk
const ::std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionToReplace,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current)
{
// Check the cache for a replica with this transaction Id.
@@ -218,6 +221,7 @@ void SessionRouter::connectBridgedSessionsWithDestination_async(const ::Asterisk
operationId,
sessionToReplace,
destination,
+ oneShotHook,
current,
mImpl->mSessionContext,
mImpl.get()));
diff --git a/src/SessionRouter.h b/src/SessionRouter.h
index 6a32948..a2fccc8 100644
--- a/src/SessionRouter.h
+++ b/src/SessionRouter.h
@@ -61,6 +61,7 @@ public:
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current&);
/**
@@ -80,6 +81,7 @@ public:
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionToReplace,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& );
/**
diff --git a/src/SessionRouterOperation.cpp b/src/SessionRouterOperation.cpp
index e0432eb..17afe61 100644
--- a/src/SessionRouterOperation.cpp
+++ b/src/SessionRouterOperation.cpp
@@ -157,6 +157,7 @@ BridgePrx getBridge(SessionPrx session)
*/
SessionSeq createSessionForEndpoints(const EndpointSeq& endpoints,
const std::string& destination,
+ const AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const SessionListenerManagerPtr& listenerManager)
{
// Add a session
@@ -169,7 +170,7 @@ SessionSeq createSessionForEndpoints(const EndpointSeq& endpoints,
// Create a session on the destination.
lg(Debug) << "createSessionForEndpoints(): Creating a session at destination " << destination;
- SessionPrx destSession = sessionEndpoint->createSession(destination, listenerManager->getListener()->getProxy());
+ SessionPrx destSession = sessionEndpoint->createSession(destination, listenerManager->getListener()->getProxy(), oneShotHook);
if(!destSession)
{
lg(Debug) << " Session endpoint returned a null proxy, continuing with other endpoints";
diff --git a/src/SessionRouterOperation.h b/src/SessionRouterOperation.h
index 6c0ad93..4d2cd8c 100644
--- a/src/SessionRouterOperation.h
+++ b/src/SessionRouterOperation.h
@@ -372,6 +372,7 @@ AsteriskSCF::SessionCommunications::V1::BridgePrx getBridge(AsteriskSCF::Session
*/
AsteriskSCF::SessionCommunications::V1::SessionSeq createSessionForEndpoints(const AsteriskSCF::Core::Endpoint::V1::EndpointSeq& endpoints,
const std::string& destination,
+ const AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const SessionListenerManagerPtr& listenerManager);
/**
diff --git a/test/MockSessionEndpoint.cpp b/test/MockSessionEndpoint.cpp
index 8bf3f85..b51bf29 100644
--- a/test/MockSessionEndpoint.cpp
+++ b/test/MockSessionEndpoint.cpp
@@ -21,6 +21,7 @@
#include "SharedTestData.h"
using namespace AsteriskSCF::SessionCommunications::V1;
+using namespace AsteriskSCF::SessionCommunications::ExtensionPoints::V1;
using namespace std;
namespace AsteriskSCF
@@ -28,7 +29,11 @@ namespace AsteriskSCF
namespace RoutingTest
{
-SessionPrx MockSessionEndpoint::createSession(const string& dest, const SessionListenerPrx&, const Ice::Current&)
+SessionPrx MockSessionEndpoint::createSession(
+ const string& dest,
+ const SessionListenerPrx&,
+ const SessionCreationHookPrx&,
+ const Ice::Current&)
{
string sessionId = dest + "_" + mId + "_" + boost::lexical_cast<string>(++mCounter);
diff --git a/test/MockSessionEndpoint.h b/test/MockSessionEndpoint.h
index 55a2de6..3cf97a2 100644
--- a/test/MockSessionEndpoint.h
+++ b/test/MockSessionEndpoint.h
@@ -36,7 +36,11 @@ public:
public:
// Overrides
- AsteriskSCF::SessionCommunications::V1::SessionPrx createSession(const std::string& dest, const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&);
+ AsteriskSCF::SessionCommunications::V1::SessionPrx createSession(
+ const std::string& dest,
+ const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
+ const AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx&,
+ const Ice::Current&);
AsteriskSCF::SessionCommunications::V1::SessionSeq getSessions(const Ice::Current&);
public:
diff --git a/test/TestRouting.cpp b/test/TestRouting.cpp
index edc04e3..1dd2209 100644
--- a/test/TestRouting.cpp
+++ b/test/TestRouting.cpp
@@ -374,13 +374,13 @@ BOOST_FIXTURE_TEST_CASE(RouteSession, PerTestFixture)
MockSessionEndpointPtr session101Endpoint = SharedTestData::instance.endpointLocator->localLookup("101");
BOOST_TEST_MESSAGE("Creating a session on our test endpoint...");
- SessionPrx session = session101Endpoint->createSession("102", 0, Ice::Current());
+ SessionPrx session = session101Endpoint->createSession("102", 0, 0, Ice::Current());
BOOST_CHECK(session != 0);
SharedTestData::instance.mBridgeConnected = false;
BOOST_TEST_MESSAGE("Routing the session...");
- SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102");
+ SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102", 0);
BOOST_CHECK(SharedTestData::instance.mBridgeConnected);
@@ -428,21 +428,21 @@ BOOST_FIXTURE_TEST_CASE(BlindTransfer, PerTestFixture)
MockSessionEndpointPtr session101Endpoint = SharedTestData::instance.endpointLocator->localLookup("101");
BOOST_TEST_MESSAGE("Creating a session on our test endpoint...");
- SessionPrx session = session101Endpoint->createSession("102", 0, Ice::Current());
+ SessionPrx session = session101Endpoint->createSession("102", 0, 0, Ice::Current());
BOOST_CHECK(session != 0);
SharedTestData::instance.mBridgeConnected = false;
SharedTestData::instance.mSessionReplaced = false;
BOOST_TEST_MESSAGE("Routing the session...");
- SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102");
+ SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102", 0);
BridgePrx bridge = session->getBridge();
BOOST_CHECK(bridge != 0);
BOOST_CHECK(SharedTestData::instance.mBridgeConnected);
// Now transfer to a new extension.
- SharedTestData::instance.sessionRouter->connectBridgedSessionsWithDestination(IceUtil::generateUUID(), session, "103");
+ SharedTestData::instance.sessionRouter->connectBridgedSessionsWithDestination(IceUtil::generateUUID(), session, "103", 0);
BOOST_CHECK(SharedTestData::instance.mSessionReplaced);
@@ -486,13 +486,13 @@ BOOST_FIXTURE_TEST_CASE(AttendedTransfer, PerTestFixture)
MockSessionEndpointPtr session101Endpoint = SharedTestData::instance.endpointLocator->localLookup("101");
BOOST_TEST_MESSAGE("Creating a session on our test endpoint...");
- SessionPrx session101 = session101Endpoint->createSession("102", 0, Ice::Current());
+ SessionPrx session101 = session101Endpoint->createSession("102", 0, 0, Ice::Current());
BOOST_CHECK(session101 != 0);
SharedTestData::instance.mBridgeConnected = false;
BOOST_TEST_MESSAGE("Routing for the first pair...");
- SharedTestData::instance.sessionRouter->routeSession("Test_AttendedTransfer_102_" + IceUtil::generateUUID(), session101, "102");
+ SharedTestData::instance.sessionRouter->routeSession("Test_AttendedTransfer_102_" + IceUtil::generateUUID(), session101, "102", 0);
BOOST_CHECK(SharedTestData::instance.mBridgeConnected);
@@ -500,7 +500,7 @@ BOOST_FIXTURE_TEST_CASE(AttendedTransfer, PerTestFixture)
MockSessionEndpointPtr session103Endpoint = SharedTestData::instance.endpointLocator->localLookup("103");
BOOST_TEST_MESSAGE("Creating a session on our next endpoint...");
- SessionPrx session103 = session103Endpoint->createSession("104", 0, Ice::Current());
+ SessionPrx session103 = session103Endpoint->createSession("104", 0, 0, Ice::Current());
BOOST_CHECK(session103 != 0);
SharedTestData::instance.mBridgeConnected = false;
@@ -508,7 +508,7 @@ BOOST_FIXTURE_TEST_CASE(AttendedTransfer, PerTestFixture)
BOOST_TEST_MESSAGE("Routing the second pair...");
- SharedTestData::instance.sessionRouter->routeSession("Test_AttendedTransfer_104_" + IceUtil::generateUUID(), session103, "104");
+ SharedTestData::instance.sessionRouter->routeSession("Test_AttendedTransfer_104_" + IceUtil::generateUUID(), session103, "104", 0);
BOOST_CHECK(SharedTestData::instance.mBridgeConnected);
@@ -721,7 +721,7 @@ BOOST_FIXTURE_TEST_CASE(FailoverRouteSession, PerTestFixture)
MockSessionEndpointPtr session101Endpoint = SharedTestData::instance.endpointLocator->localLookup("101");
BOOST_TEST_MESSAGE("Creating a session on our test endpoint...");
- SessionPrx session = session101Endpoint->createSession("102", 0, Ice::Current());
+ SessionPrx session = session101Endpoint->createSession("102", 0, 0, Ice::Current());
BOOST_CHECK(session != 0);
SharedTestData::instance.mBridgeConnected = false;
@@ -731,7 +731,7 @@ BOOST_FIXTURE_TEST_CASE(FailoverRouteSession, PerTestFixture)
// Note we're routing using AMI with no callback. The callback would never come due to the
// way the test mode shuts down the operation. Simulates failure.
- SharedTestData::instance.sessionRouter->begin_routeSession(operationId, session, "102");
+ SharedTestData::instance.sessionRouter->begin_routeSession(operationId, session, "102", 0);
for (int counter=0; SharedTestData::instance.endpointLocator->mLookupCalled == false; counter++)
{
@@ -760,7 +760,7 @@ BOOST_FIXTURE_TEST_CASE(FailoverRouteSession, PerTestFixture)
BOOST_CHECK(SharedTestData::instance.serviceReplicaMgmt->isActive() == true);
// Let the backup session router try to route using same operationId.
- SharedTestData::instance.backupSessionRouter->routeSession(operationId, session, "102");
+ SharedTestData::instance.backupSessionRouter->routeSession(operationId, session, "102", 0);
// The lookup should not be done again.
BOOST_CHECK(!SharedTestData::instance.endpointLocator->mLookupCalled);
@@ -809,14 +809,14 @@ BOOST_FIXTURE_TEST_CASE(FailoverConnectBridgedSessWithDest, PerTestFixture)
MockSessionEndpointPtr session101Endpoint = SharedTestData::instance.endpointLocator->localLookup("101");
BOOST_TEST_MESSAGE("Creating a session on our test endpoint...");
- SessionPrx session = session101Endpoint->createSession("102", 0, Ice::Current());
+ SessionPrx session = session101Endpoint->createSession("102", 0, 0, Ice::Current());
BOOST_CHECK(session != 0);
SharedTestData::instance.mBridgeConnected = false;
SharedTestData::instance.mSessionReplaced = false;
BOOST_TEST_MESSAGE("Routing the session...");
- SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102");
+ SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102", 0);
BridgePrx bridge = session->getBridge();
BOOST_CHECK(bridge != 0);
@@ -825,7 +825,7 @@ BOOST_FIXTURE_TEST_CASE(FailoverConnectBridgedSessWithDest, PerTestFixture)
string operationId = IceUtil::generateUUID();
// Now transfer to a new extension. In our test mode, this operation will never complete.
- SharedTestData::instance.sessionRouter->begin_connectBridgedSessionsWithDestination(operationId, session, "103");
+ SharedTestData::instance.sessionRouter->begin_connectBridgedSessionsWithDestination(operationId, session, "103", 0);
for (int counter=0; SharedTestData::instance.mSessionReplaced == false; counter++)
{
@@ -856,7 +856,7 @@ BOOST_FIXTURE_TEST_CASE(FailoverConnectBridgedSessWithDest, PerTestFixture)
BOOST_CHECK(SharedTestData::instance.serviceReplicaMgmt->isActive() == true);
// Let the backup session router try to route using same operationId. Synchronous call.
- SharedTestData::instance.backupSessionRouter->connectBridgedSessionsWithDestination(operationId, session, "103");
+ SharedTestData::instance.backupSessionRouter->connectBridgedSessionsWithDestination(operationId, session, "103", 0);
// The lookup should not be done again.
BOOST_CHECK(SharedTestData::instance.endpointLocator->mLookupCalled == false);
commit 993ad008145aa1e618679b910844de5f2ad212d6
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jul 19 14:43:34 2011 -0500
Explicitly link to the 'dl' library on UNIX-type platforms.
I have no explanation as to why this just now became necessary... but the Lua 5.1
libraries use various functions from libdl, so the Routing Service component
needs to be linked to that library.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5e236a0..214d391 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,6 +42,9 @@ astscf_component_add_boost_libraries(BasicRoutingService thread date_time core r
astscf_component_add_slice_collection_libraries(BasicRoutingService ASTSCF)
astscf_component_build_icebox(BasicRoutingService)
target_link_libraries(BasicRoutingService ${LUA_LIBRARIES} logging-client astscf-util-cpp)
+if(UNIX)
+ target_link_libraries(BasicRoutingService dl)
+endif()
astscf_component_install(BasicRoutingService)
astscf_component_init(BasicRoutingStateReplicator)
commit 17c3811aa8ef6339d6712eaf37f1066ae8a40605
Author: Brent Eagles <beagles at digium.com>
Date: Thu Jul 14 20:03:23 2011 -0230
Support for slice changes for bridge cookies
diff --git a/test/MockBridge.cpp b/test/MockBridge.cpp
index d50090b..e0fc4f0 100644
--- a/test/MockBridge.cpp
+++ b/test/MockBridge.cpp
@@ -170,6 +170,19 @@ void MockBridge::replaceSession_async(const AsteriskSCF::SessionCommunications::
}
}
+void MockBridge::setCookies(const AsteriskSCF::SessionCommunications::V1::BridgeCookies& , const Ice::Current&)
+{
+}
+
+void MockBridge::removeCookies(const AsteriskSCF::SessionCommunications::V1::BridgeCookies& , const Ice::Current&)
+{
+}
+
+AsteriskSCF::SessionCommunications::V1::BridgeCookies MockBridge::getCookies(const AsteriskSCF::SessionCommunications::V1::BridgeCookies& , const Ice::Current&)
+{
+ return AsteriskSCF::SessionCommunications::V1::BridgeCookies();
+}
+
void MockBridge::connected(const AsteriskSCF::SessionCommunications::V1::SessionPrx&)
{
SharedTestData::instance.mBridgeConnected = true;
diff --git a/test/MockBridge.h b/test/MockBridge.h
index 92b4d46..7204363 100644
--- a/test/MockBridge.h
+++ b/test/MockBridge.h
@@ -51,6 +51,10 @@ public:
const AsteriskSCF::SessionCommunications::V1::SessionSeq& newSessions,
const Ice::Current&);
+ void setCookies(const AsteriskSCF::SessionCommunications::V1::BridgeCookies& cookies, const Ice::Current&);
+ void removeCookies(const AsteriskSCF::SessionCommunications::V1::BridgeCookies& cookies, const Ice::Current&);
+ AsteriskSCF::SessionCommunications::V1::BridgeCookies getCookies(const AsteriskSCF::SessionCommunications::V1::BridgeCookies& cookies, const Ice::Current&);
+
// Implementation
void connected(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session);
void removeSession(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session);
commit 2650fb29af5f61860f5e87cb7d1686d752a3053d
Author: Joshua Colp <jcolp at digium.com>
Date: Sun Jul 10 12:06:03 2011 -0300
Change test configuration filename to be the actual file and not one that no longer exists.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2578402..49d760c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,4 +17,4 @@ astscf_component_add_ice_libraries(RoutingTest IceStorm)
astscf_component_add_boost_libraries(RoutingTest unit_test_framework)
astscf_component_add_slice_collection_libraries(RoutingTest ASTSCF)
astscf_component_build_icebox(RoutingTest)
-astscf_test_icebox(RoutingTest config/routingtest-integ.config)
+astscf_test_icebox(RoutingTest config/routingtest.conf)
-----------------------------------------------------------------------
--
asterisk-scf/integration/routing.git
More information about the asterisk-scf-commits
mailing list