[asterisk-scf-commits] asterisk-scf/integration/mediatransportudptl.git branch "operation-context-propagation" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Feb 6 13:43:10 CST 2012
branch "operation-context-propagation" has been created
at c431e1d924d7849ea4ee156cc98b068a7917e10e (commit)
- Log -----------------------------------------------------------------
commit c431e1d924d7849ea4ee156cc98b068a7917e10e
Author: Brent Eagles <beagles at digium.com>
Date: Mon Feb 6 16:11:36 2012 -0330
Initial changes for addition of operation context to interfaces.
diff --git a/src/Component.cpp b/src/Component.cpp
index 60dadb9..43e3374 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -31,6 +31,7 @@
#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Discovery/SmartProxy.h>
#include <AsteriskSCF/Component/Component.h>
+#include <AsteriskSCF/Helpers/OperationContext.h>
#include "UdptlReplicationContext.h"
#include "UDPTLSession.h"
@@ -76,7 +77,7 @@ public:
{
};
- UDPTLSessionPrx allocate(const UDPTLServiceLocatorParamsPtr& params, const Ice::Current&)
+ UDPTLSessionPrx allocate(const AsteriskSCF::System::V1::OperationContextPtr&, const UDPTLServiceLocatorParamsPtr& params, const Ice::Current&)
{
return AsteriskSCF::UDPTL::UDPTLSession::create(mAdapter, IceUtil::generateUUID(), mEnvironment, params,
mReplicationContext, mConfigurationService);
@@ -455,7 +456,7 @@ void Component::onRegisterPrimaryServices()
}
mGeneralState->serviceManagement = mUdptlMediaServiceRegistration->getServiceManagement();
- mGeneralState->serviceManagement->addLocatorParams(mUdptlLocatorParams, "");
+ mGeneralState->serviceManagement->addLocatorParams(AsteriskSCF::createContext(), mUdptlLocatorParams, "");
}
void Component::onStart()
diff --git a/src/UDPTLConfiguration.cpp b/src/UDPTLConfiguration.cpp
index 4fe9af5..a3d5b2c 100644
--- a/src/UDPTLConfiguration.cpp
+++ b/src/UDPTLConfiguration.cpp
@@ -49,12 +49,16 @@ public:
AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq
getConfigurationGroups(const Ice::Current&);
- void setConfiguration(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
+ void setConfiguration(const AsteriskSCF::System::V1::OperationContextPtr&,
+ const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
- void removeConfigurationItems(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&,
- const Ice::Current&);
- void removeConfigurationGroups(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&,
- const Ice::Current&);
+ void removeConfigurationItems(const AsteriskSCF::System::V1::OperationContextPtr&,
+ const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&,
+ const Ice::Current&);
+
+ void removeConfigurationGroups(const AsteriskSCF::System::V1::OperationContextPtr&,
+ const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&,
+ const Ice::Current&);
int getStartPort();
int getEndPort();
@@ -278,7 +282,9 @@ ConfigurationGroupSeq ConfigurationServiceServant::getConfigurationGroups(const
return groups;
}
-void ConfigurationServiceServant::setConfiguration(const ConfigurationGroupSeq& groups,
+void ConfigurationServiceServant::setConfiguration(
+ const AsteriskSCF::System::V1::OperationContextPtr&,
+ const ConfigurationGroupSeq& groups,
const Ice::Current&)
{
class GroupVisitor : public UdptlConfigurationGroupVisitor
@@ -465,7 +471,7 @@ void ConfigurationServiceServant::setConfiguration(const ConfigurationGroupSeq&
}
}
-void ConfigurationServiceServant::removeConfigurationItems(
+void ConfigurationServiceServant::removeConfigurationItems(const AsteriskSCF::System::V1::OperationContextPtr&,
const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
{
class GroupVisitor : public UdptlConfigurationGroupVisitor
@@ -619,7 +625,8 @@ void ConfigurationServiceServant::removeConfigurationItems(
}
}
-void ConfigurationServiceServant::removeConfigurationGroups(const ConfigurationGroupSeq& groups, const Ice::Current&)
+void ConfigurationServiceServant::removeConfigurationGroups(const AsteriskSCF::System::V1::OperationContextPtr&,
+ const ConfigurationGroupSeq& groups, const Ice::Current&)
{
class GroupVisitor : public UdptlConfigurationGroupVisitor
{
diff --git a/src/UDPTLSink.cpp b/src/UDPTLSink.cpp
index 319e530..6c08fd6 100644
--- a/src/UDPTLSink.cpp
+++ b/src/UDPTLSink.cpp
@@ -175,7 +175,8 @@ std::string StreamSinkUDPTLImpl::getId(const Ice::Current&)
/**
* Implementation of the setRemoteDetails method as defined in NetworkIf.ice
*/
-void StreamSinkUDPTLImpl::setRemoteDetails(const string& address, Ice::Int port, const Ice::Current&)
+void StreamSinkUDPTLImpl::setRemoteDetails(const string& address, Ice::Int port,
+ const Ice::Current&)
{
mImpl->mSessionAdapter->setRemoteDetails(address, port);
diff --git a/src/UDPTLSource.cpp b/src/UDPTLSource.cpp
index 44ce10c..368c567 100644
--- a/src/UDPTLSource.cpp
+++ b/src/UDPTLSource.cpp
@@ -182,7 +182,7 @@ std::string StreamSourceUDPTLImpl::getId(const Ice::Current&)
/**
* Implementation of the requestMethod method as defined in MediaIf.ice
*/
-void StreamSourceUDPTLImpl::requestFormat(const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&)
+void StreamSourceUDPTLImpl::requestFormat(const AsteriskSCF::System::V1::OperationContextPtr&, const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&)
{
// We do not currently support switching formats.
throw MediaFormatSwitchException();
diff --git a/src/UDPTLSource.h b/src/UDPTLSource.h
index fede4a7..1496c02 100644
--- a/src/UDPTLSource.h
+++ b/src/UDPTLSource.h
@@ -36,7 +36,7 @@ public:
AsteriskSCF::Media::V1::StreamSinkSeq getSinks(const Ice::Current&);
AsteriskSCF::Media::V1::FormatSeq getFormats(const Ice::Current&);
std::string getId(const Ice::Current&);
- void requestFormat(const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&);
+ void requestFormat(const AsteriskSCF::System::V1::OperationContextPtr&, const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&);
AsteriskSCF::Network::V1::AddressInformation getLocalDetails(const Ice::Current&);
diff --git a/src/UdptlStateReplicatorApp.cpp b/src/UdptlStateReplicatorApp.cpp
index 59016bd..47a4ad4 100644
--- a/src/UdptlStateReplicatorApp.cpp
+++ b/src/UdptlStateReplicatorApp.cpp
@@ -26,6 +26,7 @@
#include <AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h>
#include <AsteriskSCF/System/Component/ConfigurationIf.h>
#include <AsteriskSCF/Media/UDPTL/MediaUDPTLIf.h>
+#include <AsteriskSCF/Helpers/OperationContext.h>
#include "UdptlConfigurationIf.h"
#include "UdptlStateReplicator.h"
@@ -171,7 +172,7 @@ void UdptlStateReplicatorService::registerWithServiceLocator(const Ice::Communic
genericparams->category = AsteriskSCF::Replication::UDPTL::V1::StateReplicatorComponentCategory;
genericparams->service = ic->getProperties()->getPropertyWithDefault(mAppName + ".ServiceName", "default");
genericparams->id = mAppName;
- mComponentServiceManagement->addLocatorParams(genericparams, "");
+ mComponentServiceManagement->addLocatorParams(AsteriskSCF::createContext(), genericparams, "");
Ice::ObjectPrx stateReplicatorObjectPrx = mAdapter->createDirectProxy(ic->stringToIdentity(ServiceDiscoveryId));
UdptlStateReplicatorPrx stateReplicatorPrx = UdptlStateReplicatorPrx::checkedCast(stateReplicatorObjectPrx);
@@ -184,7 +185,7 @@ void UdptlStateReplicatorService::registerWithServiceLocator(const Ice::Communic
discoveryParams->category = AsteriskSCF::Replication::UDPTL::V1::StateReplicatorDiscoveryCategory;
discoveryParams->service = ic->getProperties()->getPropertyWithDefault(mAppName + ".ServiceName", "default");
discoveryParams->id = mAppName;
- mStateReplicationManagement->addLocatorParams(discoveryParams, "");
+ mStateReplicationManagement->addLocatorParams(AsteriskSCF::createContext(), discoveryParams, "");
// Publish the configuration service IceStorm topic so everybody gets configuration
mConfigurationManagement = ServiceManagementPrx::uncheckedCast(
@@ -195,7 +196,7 @@ void UdptlStateReplicatorService::registerWithServiceLocator(const Ice::Communic
configurationParams->category = ConfigurationDiscoveryCategory;
configurationParams->service = ic->getProperties()->getPropertyWithDefault(mAppName + ".ServiceName", "default");
configurationParams->id = mAppName;
- mConfigurationManagement->addLocatorParams(configurationParams, "");
+ mConfigurationManagement->addLocatorParams(AsteriskSCF::createContext(), configurationParams, "");
// TBD... We may have other interfaces to publish to the Service Locator.
}
diff --git a/test/TestMediaTransportUDPTL.cpp b/test/TestMediaTransportUDPTL.cpp
index 4e6bba9..92dffc3 100644
--- a/test/TestMediaTransportUDPTL.cpp
+++ b/test/TestMediaTransportUDPTL.cpp
@@ -35,6 +35,7 @@
#include <AsteriskSCF/Media/MediaIf.h>
#include <AsteriskSCF/Media/UDPTL/MediaUDPTLIf.h>
#include <AsteriskSCF/Media/NetworkIf.h>
+#include <AsteriskSCF/Helpers/OperationContext.h>
#include "UdptlStateReplicationIf.h"
@@ -432,7 +433,7 @@ BOOST_AUTO_TEST_CASE(AllocateUDPTLSession)
// You might think "geez, this should deadlock due to state replication" but no, we use one ways for that
boost::mutex::scoped_lock lock(Testbed.mLock);
- Testbed.session = service->allocate(params);
+ Testbed.session = service->allocate(AsteriskSCF::createContext(), params);
// Give the RTP component time to replicate this session
Testbed.mCondition.wait(lock);
diff --git a/test/TestUDPTLICE.cpp b/test/TestUDPTLICE.cpp
index 546d9a3..29d3f95 100644
--- a/test/TestUDPTLICE.cpp
+++ b/test/TestUDPTLICE.cpp
@@ -29,6 +29,7 @@
#include <boost/thread/condition.hpp>
#include <Ice/Ice.h>
#include <Ice/BuiltinSequences.h>
+#include <AsteriskSCF/Helpers/OperationContext.h>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include <AsteriskSCF/Media/MediaIf.h>
@@ -177,7 +178,7 @@ BOOST_AUTO_TEST_CASE(UdptlSessionWithICEEnabled)
ConfigurationGroupSeq s;
s.push_back(iceGroup);
- configPrx->setConfiguration(s);
+ configPrx->setConfiguration(AsteriskSCF::createContext(), s);
UDPTLMediaServicePrx servicePrx;
{
@@ -195,7 +196,7 @@ BOOST_AUTO_TEST_CASE(UdptlSessionWithICEEnabled)
query->enableICE = true;
query->enableTURN = false;
UDPTLSessionPrx sessionPrx;
- BOOST_REQUIRE_NO_THROW(sessionPrx = servicePrx->allocate(query));
+ BOOST_REQUIRE_NO_THROW(sessionPrx = servicePrx->allocate(AsteriskSCF::createContext(), query));
BOOST_REQUIRE(sessionPrx != 0);
sessionPrx->ice_ping(); // To silence unused arg warning.
sessionPrx->release();
@@ -240,14 +241,14 @@ BOOST_AUTO_TEST_CASE(UdptlSessionAllocationFailure)
iceGroup->configurationItems[UDPTLICETransportFlagsItemName] = iceFlags;
ConfigurationGroupSeq s;
s.push_back(iceGroup);
- BOOST_REQUIRE_NO_THROW(configPrx->setConfiguration(s));
+ BOOST_REQUIRE_NO_THROW(configPrx->setConfiguration(AsteriskSCF::createContext(), s));
try
{
UDPTLOverICEServiceLocatorParamsPtr query = new UDPTLOverICEServiceLocatorParams;
query->category = "udptl";
query->enableICE = true;
query->enableTURN = true;
- UDPTLSessionPrx sessionPrx = servicePrx->allocate(query);
+ UDPTLSessionPrx sessionPrx = servicePrx->allocate(AsteriskSCF::createContext(), query);
sessionPrx->ice_ping();
}
catch (const SessionAllocationFailure& ex)
commit 3b3d792e8612d861dde1c04efbf5a00d5d51205e
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Jan 3 14:37:43 2012 -0600
Adjust component library names and update test config files
diff --git a/config/test_component.config b/config/test_component.config
index bba9f35..f7fc24e 100644
--- a/config/test_component.config
+++ b/config/test_component.config
@@ -5,15 +5,15 @@
#
IceBox.InheritProperties=1
-IceBox.LoadOrder=ServiceDiscovery,UdptlStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
+IceBox.LoadOrder=ServiceDiscovery,UDPTLStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
Ice.Override.Timeout=5000
# RtpStateReplicator Configuration
-IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
+IceBox.Service.UDPTLStateReplicator=UDPTLStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
+UDPTLStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
# A proxy to the service locator management service
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
@@ -38,13 +38,13 @@ MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
# TestMediaTransportUDPTL Configuration
#
-IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_test:create
+IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTLTest:create
#
# Service Locator Configuration
#
-IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
@@ -53,12 +53,12 @@ ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
-UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
-UdptlStateReplicator.IceStorm.Trace.TopicManager=2
-UdptlStateReplicator.IceStorm.Transient=1
-UdptlStateReplicator.IceStorm.Flush.Timeout=2000
+UDPTLStateReplicator.IceStorm.InstanceName=UDPTLStateReplicator
+UDPTLStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UDPTLStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
+UDPTLStateReplicator.IceStorm.Trace.TopicManager=2
+UDPTLStateReplicator.IceStorm.Transient=1
+UDPTLStateReplicator.IceStorm.Flush.Timeout=2000
ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
diff --git a/config/test_component_v6.config b/config/test_component_v6.config
index 5b930d2..2a04fed 100644
--- a/config/test_component_v6.config
+++ b/config/test_component_v6.config
@@ -5,15 +5,15 @@
#
IceBox.InheritProperties=1
-IceBox.LoadOrder=ServiceDiscovery,UdptlStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
+IceBox.LoadOrder=ServiceDiscovery,UDPTLStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
Ice.Override.Timeout=5000
# RtpStateReplicator Configuration
-IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
+IceBox.Service.UDPTLStateReplicator=UDPTLStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
+UDPTLStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
# A proxy to the service locator management service
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
@@ -38,13 +38,13 @@ MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
# TestMediaTransportUDPTL Configuration
#
-IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_test_v6:create
+IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTLTestV6:create
#
# Service Locator Configuration
#
-IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
@@ -53,12 +53,12 @@ ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
-UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
-UdptlStateReplicator.IceStorm.Trace.TopicManager=2
-UdptlStateReplicator.IceStorm.Transient=1
-UdptlStateReplicator.IceStorm.Flush.Timeout=2000
+UDPTLStateReplicator.IceStorm.InstanceName=UDPTLStateReplicator
+UDPTLStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UDPTLStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
+UDPTLStateReplicator.IceStorm.Trace.TopicManager=2
+UDPTLStateReplicator.IceStorm.Transient=1
+UDPTLStateReplicator.IceStorm.Flush.Timeout=2000
ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
diff --git a/config/test_udptl_ice.conf b/config/test_udptl_ice.conf
index 9299405..9e20ebd 100644
--- a/config/test_udptl_ice.conf
+++ b/config/test_udptl_ice.conf
@@ -4,18 +4,18 @@
# Icebox Configuration
#
-UdptlConfiguration.Name=UdptlStateReplicator
+UDPTLConfiguration.Name=UDPTLStateReplicator
IceBox.InheritProperties=1
-IceBox.LoadOrder=ServiceDiscovery,UdptlStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
+IceBox.LoadOrder=ServiceDiscovery,UDPTLStateReplicator,MediaTransportUDPTL,TestMediaTransportUDPTL
Ice.Override.Timeout=5000
# RtpStateReplicator Configuration
-IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
+IceBox.Service.UDPTLStateReplicator=UDPTLStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
+UDPTLStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
# A proxy to the service locator management service
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
@@ -40,13 +40,13 @@ MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
# TestMediaTransportUDPTL Configuration
#
-IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_ice_test:create
+IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTLIceTest:create
#
# Service Locator Configuration
#
-IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
@@ -55,12 +55,12 @@ ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
-UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
-UdptlStateReplicator.IceStorm.Trace.TopicManager=2
-UdptlStateReplicator.IceStorm.Transient=1
-UdptlStateReplicator.IceStorm.Flush.Timeout=2000
+UDPTLStateReplicator.IceStorm.InstanceName=UDPTLStateReplicator
+UDPTLStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UDPTLStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
+UDPTLStateReplicator.IceStorm.Trace.TopicManager=2
+UDPTLStateReplicator.IceStorm.Transient=1
+UDPTLStateReplicator.IceStorm.Flush.Timeout=2000
ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e12c557..5644864 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,28 +1,28 @@
include_directories(${astscf-ice-util-cpp_dir}/include)
-astscf_component_init(MediaTransportUDPTL_test)
-astscf_component_add_files(MediaTransportUDPTL_test TestMediaTransportUDPTL.cpp)
-astscf_component_add_slices(MediaTransportUDPTL_test PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
-astscf_component_add_boost_libraries(MediaTransportUDPTL_test unit_test_framework thread date_time)
-astscf_component_add_slice_collection_libraries(MediaTransportUDPTL_test ASTSCF)
-astscf_component_build_icebox(MediaTransportUDPTL_test)
+astscf_component_init(MediaTransportUDPTLTest)
+astscf_component_add_files(MediaTransportUDPTLTest TestMediaTransportUDPTL.cpp)
+astscf_component_add_slices(MediaTransportUDPTLTest PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
+astscf_component_add_boost_libraries(MediaTransportUDPTLTest unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(MediaTransportUDPTLTest ASTSCF)
+astscf_component_build_icebox(MediaTransportUDPTLTest)
-astscf_component_init(MediaTransportUDPTL_test_v6)
-astscf_component_add_files(MediaTransportUDPTL_test_v6 TestMediaTransportUDPTL.cpp)
-astscf_component_add_slices(MediaTransportUDPTL_test_v6 PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
-astscf_component_add_boost_libraries(MediaTransportUDPTL_test_v6 unit_test_framework thread date_time)
-astscf_component_add_slice_collection_libraries(MediaTransportUDPTL_test_v6 ASTSCF)
-astscf_component_build_icebox(MediaTransportUDPTL_test_v6)
-set_property(TARGET MediaTransportUDPTL_test_v6 PROPERTY COMPILE_DEFINITIONS IPV6_TEST)
+astscf_component_init(MediaTransportUDPTLTestV6)
+astscf_component_add_files(MediaTransportUDPTLTestV6 TestMediaTransportUDPTL.cpp)
+astscf_component_add_slices(MediaTransportUDPTLTestV6 PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
+astscf_component_add_boost_libraries(MediaTransportUDPTLTestV6 unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(MediaTransportUDPTLTestV6 ASTSCF)
+astscf_component_build_icebox(MediaTransportUDPTLTestV6)
+set_property(TARGET MediaTransportUDPTLTestV6 PROPERTY COMPILE_DEFINITIONS IPV6Test)
-astscf_component_init(MediaTransportUDPTL_ice_test)
-astscf_component_add_files(MediaTransportUDPTL_ice_test TestUDPTLICE.cpp)
-astscf_component_add_slices(MediaTransportUDPTL_ice_test PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
-astscf_component_add_slices(MediaTransportUDPTL_ice_test PROJECT AsteriskSCF/Configuration/UDPTL/UdptlConfigurationIf.ice)
-astscf_component_add_boost_libraries(MediaTransportUDPTL_ice_test unit_test_framework thread date_time)
-astscf_component_add_slice_collection_libraries(MediaTransportUDPTL_ice_test ASTSCF)
-astscf_component_build_icebox(MediaTransportUDPTL_ice_test)
-pjproject_link(MediaTransportUDPTL_ice_test pjlib)
+astscf_component_init(MediaTransportUDPTLIceTest)
+astscf_component_add_files(MediaTransportUDPTLIceTest TestUDPTLICE.cpp)
+astscf_component_add_slices(MediaTransportUDPTLIceTest PROJECT AsteriskSCF/Replication/UDPTL/UdptlStateReplicationIf.ice)
+astscf_component_add_slices(MediaTransportUDPTLIceTest PROJECT AsteriskSCF/Configuration/UDPTL/UdptlConfigurationIf.ice)
+astscf_component_add_boost_libraries(MediaTransportUDPTLIceTest unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(MediaTransportUDPTLIceTest ASTSCF)
+astscf_component_build_icebox(MediaTransportUDPTLIceTest)
+pjproject_link(MediaTransportUDPTLIceTest pjlib)
-astscf_test_icebox(MediaTransportUDPTL_test config/test_component.config)
-astscf_test_icebox(MediaTransportUDPTL_test_v6 config/test_component_v6.config)
-astscf_test_icebox(MediaTransportUDPTL_ice_test config/test_udptl_ice.conf)
+astscf_test_icebox(MediaTransportUDPTLTest config/test_component.config)
+astscf_test_icebox(MediaTransportUDPTLTestV6 config/test_component_v6.config)
+astscf_test_icebox(MediaTransportUDPTLIceTest config/test_udptl_ice.conf)
commit 400bd789f88a1eab4f17a2a061e4ebee1344b454
Merge: 97a2ae9 944a99d
Author: Mark Michelson <mmichelson at digium.com>
Date: Fri Dec 30 14:54:24 2011 -0600
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/media_transport_udptl
commit 97a2ae9d12eed722c7d55edfe937f54ba6d6d3e0
Author: Mark Michelson <mmichelson at digium.com>
Date: Wed Dec 28 12:17:23 2011 -0600
Adjust for name changes in ice-util-cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a08365d..d62083b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,7 +43,7 @@ astscf_component_add_slices(MediaTransportUDPTL PROJECT AsteriskSCF/Configuratio
astscf_component_add_boost_libraries(MediaTransportUDPTL core thread)
astscf_component_add_slice_collection_libraries(MediaTransportUDPTL ASTSCF)
astscf_component_build_icebox(MediaTransportUDPTL)
-target_link_libraries(MediaTransportUDPTL LoggingClient astscf-ice-util-cpp)
+target_link_libraries(MediaTransportUDPTL LoggingClient ASTSCFIceUtilCpp)
pjproject_link(MediaTransportUDPTL pjlib)
pjproject_link(MediaTransportUDPTL pjlib-util)
@@ -60,5 +60,5 @@ astscf_component_add_ice_libraries(UdptlStateReplicator IceStorm)
astscf_component_add_boost_libraries(UdptlStateReplicator thread date_time)
astscf_component_add_slice_collection_libraries(UdptlStateReplicator ASTSCF)
astscf_component_build_icebox(UdptlStateReplicator)
-target_link_libraries(UdptlStateReplicator LoggingClient astscf-ice-util-cpp)
+target_link_libraries(UdptlStateReplicator LoggingClient ASTSCFIceUtilCpp)
astscf_component_install(UdptlStateReplicator)
commit a149c41afcf76b410a428c76614642493e298a95
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Dec 27 16:32:35 2011 -0600
Adjust for logging changes.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f196d1..a08365d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,7 +43,7 @@ astscf_component_add_slices(MediaTransportUDPTL PROJECT AsteriskSCF/Configuratio
astscf_component_add_boost_libraries(MediaTransportUDPTL core thread)
astscf_component_add_slice_collection_libraries(MediaTransportUDPTL ASTSCF)
astscf_component_build_icebox(MediaTransportUDPTL)
-target_link_libraries(MediaTransportUDPTL logging-client astscf-ice-util-cpp)
+target_link_libraries(MediaTransportUDPTL LoggingClient astscf-ice-util-cpp)
pjproject_link(MediaTransportUDPTL pjlib)
pjproject_link(MediaTransportUDPTL pjlib-util)
@@ -60,5 +60,5 @@ astscf_component_add_ice_libraries(UdptlStateReplicator IceStorm)
astscf_component_add_boost_libraries(UdptlStateReplicator thread date_time)
astscf_component_add_slice_collection_libraries(UdptlStateReplicator ASTSCF)
astscf_component_build_icebox(UdptlStateReplicator)
-target_link_libraries(UdptlStateReplicator logging-client astscf-ice-util-cpp)
+target_link_libraries(UdptlStateReplicator LoggingClient astscf-ice-util-cpp)
astscf_component_install(UdptlStateReplicator)
diff --git a/src/Component.cpp b/src/Component.cpp
index a88da51..60dadb9 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -28,7 +28,7 @@
#include <AsteriskSCF/Media/UDPTL/MediaUDPTLIf.h>
#include <AsteriskSCF/System/Component/ConfigurationIf.h>
#include <AsteriskSCF/Logger/IceLogger.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Discovery/SmartProxy.h>
#include <AsteriskSCF/Component/Component.h>
diff --git a/src/ICETransport.cpp b/src/ICETransport.cpp
index 7c083f2..db2337d 100644
--- a/src/ICETransport.cpp
+++ b/src/ICETransport.cpp
@@ -29,7 +29,7 @@
#include <AsteriskSCF/System/NAT/NATTraversalIf.h>
#include <Ice/Ice.h>
#include <sstream>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <IceUtil/UUID.h>
using namespace AsteriskSCF::UDPTL;
diff --git a/src/NATConfig.cpp b/src/NATConfig.cpp
index 5307156..ef894b8 100644
--- a/src/NATConfig.cpp
+++ b/src/NATConfig.cpp
@@ -19,7 +19,7 @@
#include <Ice/Properties.h>
#include <AsteriskSCF/System/ExceptionsIf.h>
#include <pjnath.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
using namespace std;
using namespace AsteriskSCF::Helpers;
diff --git a/src/UDPTLSource.cpp b/src/UDPTLSource.cpp
index c639d79..44ce10c 100644
--- a/src/UDPTLSource.cpp
+++ b/src/UDPTLSource.cpp
@@ -27,7 +27,7 @@
#include <AsteriskSCF/Media/MediaIf.h>
#include <AsteriskSCF/Media/UDPTL/MediaUDPTLIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/System/Component/ReplicaIf.h>
#include "udptl.h"
diff --git a/src/UdptlStateReplicatorApp.cpp b/src/UdptlStateReplicatorApp.cpp
index a9b3c8a..59016bd 100644
--- a/src/UdptlStateReplicatorApp.cpp
+++ b/src/UdptlStateReplicatorApp.cpp
@@ -22,7 +22,7 @@
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include <AsteriskSCF/System/Component/ComponentServiceIf.h>
#include <AsteriskSCF/Logger/IceLogger.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h>
#include <AsteriskSCF/System/Component/ConfigurationIf.h>
#include <AsteriskSCF/Media/UDPTL/MediaUDPTLIf.h>
commit 944a99d7b24d1d8a1ecd7b08a4adf6820582b383
Author: Brent Eagles <beagles at digium.com>
Date: Tue Dec 6 17:20:07 2011 -0330
Modify all tests to use loopback adapter
diff --git a/config/test_component.config b/config/test_component.config
index 241a91c..bba9f35 100644
--- a/config/test_component.config
+++ b/config/test_component.config
@@ -13,13 +13,13 @@ Ice.Override.Timeout=5000
IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp:udp
+UdptlStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
# A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
# A proxy to the service locator service
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
#
# MediaTransportUDPTL Configuration
@@ -28,9 +28,11 @@ LocatorService.Proxy=LocatorService:tcp -p 4411
IceBox.Service.MediaTransportUDPTL=MediaTransportUDPTL:create
# Adapter parameters for this component
-MediaTransportUDPTLAdapter.Endpoints=default
-MediaTransportUDPTLAdapterLocal.Endpoints=default
-MediaTransportUDPTLAdapterLogger.Endpoints=default
+MediaTransportUDPTLAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLocal.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLogger.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.ServiceAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
#
# TestMediaTransportUDPTL Configuration
@@ -45,21 +47,21 @@ IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_test:create
IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 10000
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 10001:udp -h 127.0.0.1 -p 10001
ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -p 10006
+UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
UdptlStateReplicator.IceStorm.Trace.TopicManager=2
UdptlStateReplicator.IceStorm.Transient=1
UdptlStateReplicator.IceStorm.Flush.Timeout=2000
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
-ServiceDiscovery.BackplaneAdapter.Endpoints=default
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
+ServiceDiscovery.BackplaneAdapter.Endpoints=default -h 127.0.0.1
-LoggerAdapter.Endpoints=default
+LoggerAdapter.Endpoints=default -h 127.0.0.1
diff --git a/config/test_component_v6.config b/config/test_component_v6.config
index 89a8889..5b930d2 100644
--- a/config/test_component_v6.config
+++ b/config/test_component_v6.config
@@ -13,13 +13,13 @@ Ice.Override.Timeout=5000
IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp:udp
+UdptlStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
# A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
# A proxy to the service locator service
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
#
# MediaTransportUDPTL Configuration
@@ -28,9 +28,11 @@ LocatorService.Proxy=LocatorService:tcp -p 4411
IceBox.Service.MediaTransportUDPTL=MediaTransportUDPTL:create
# Adapter parameters for this component
-MediaTransportUDPTLAdapter.Endpoints=default
-MediaTransportUDPTLAdapterLocal.Endpoints=default
-MediaTransportUDPTLAdapterLogger.Endpoints=default
+MediaTransportUDPTLAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLocal.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLogger.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.ServiceAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
#
# TestMediaTransportUDPTL Configuration
@@ -45,20 +47,20 @@ IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_test_v6:create
IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 10000
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 10001:udp -h 127.0.0.1 -p 10001
ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -p 10006
+UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
UdptlStateReplicator.IceStorm.Trace.TopicManager=2
UdptlStateReplicator.IceStorm.Transient=1
UdptlStateReplicator.IceStorm.Flush.Timeout=2000
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
-LoggerAdapter.Endpoints=default
+LoggerAdapter.Endpoints=default -h 127.0.0.1
diff --git a/config/test_udptl_ice.conf b/config/test_udptl_ice.conf
index 0d24c2f..9299405 100644
--- a/config/test_udptl_ice.conf
+++ b/config/test_udptl_ice.conf
@@ -15,13 +15,13 @@ Ice.Override.Timeout=5000
IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp:udp
+UdptlStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
# A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
# A proxy to the service locator service
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
#
# MediaTransportUDPTL Configuration
@@ -30,9 +30,11 @@ LocatorService.Proxy=LocatorService:tcp -p 4411
IceBox.Service.MediaTransportUDPTL=MediaTransportUDPTL:create
# Adapter parameters for this component
-MediaTransportUDPTLAdapter.Endpoints=default
-MediaTransportUDPTLAdapterLocal.Endpoints=default
-MediaTransportUDPTLAdapterLogger.Endpoints=default
+MediaTransportUDPTLAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLocal.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLogger.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.ServiceAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
#
# TestMediaTransportUDPTL Configuration
@@ -47,21 +49,21 @@ IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_ice_test:create
IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 10000
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 10001:udp -h 127.0.0.1 -p 10001
ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -p 10006
+UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
UdptlStateReplicator.IceStorm.Trace.TopicManager=2
UdptlStateReplicator.IceStorm.Transient=1
UdptlStateReplicator.IceStorm.Flush.Timeout=2000
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
-ServiceDiscovery.BackplaneAdapter.Endpoints=default
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
+ServiceDiscovery.BackplaneAdapter.Endpoints=default -h 127.0.0.1
-LoggerAdapter.Endpoints=default
+LoggerAdapter.Endpoints=default -h 127.0.0.1
diff --git a/test/TestMediaTransportUDPTL.cpp b/test/TestMediaTransportUDPTL.cpp
index 0b99136..4e6bba9 100644
--- a/test/TestMediaTransportUDPTL.cpp
+++ b/test/TestMediaTransportUDPTL.cpp
@@ -269,7 +269,7 @@ struct GlobalIceFixture
{
Testbed.communicator = Ice::initialize(mCachedArgs.argc, mCachedArgs.argv);
- Testbed.adapter = Testbed.communicator->createObjectAdapterWithEndpoints("Adapter", "default");
+ Testbed.adapter = Testbed.communicator->createObjectAdapterWithEndpoints("Adapter", "default -h 127.0.0.1");
StreamSinkPtr sink = new TestStreamSink();
@@ -281,7 +281,7 @@ struct GlobalIceFixture
Testbed.adapter->activate();
- Testbed.locator = ServiceLocatorPrx::checkedCast(Testbed.communicator->stringToProxy("LocatorService:tcp -p 4411"));
+ Testbed.locator = ServiceLocatorPrx::checkedCast(Testbed.communicator->stringToProxy("LocatorService:tcp -h 127.0.0.1 -p 4411"));
if (!Testbed.locator) {
throw "Invalid service locator proxy";
diff --git a/test/TestUDPTLICE.cpp b/test/TestUDPTLICE.cpp
index 402a55a..546d9a3 100644
--- a/test/TestUDPTLICE.cpp
+++ b/test/TestUDPTLICE.cpp
@@ -75,7 +75,7 @@ public:
Ice::InitializationData data;
data.properties = IceBoxTestEnv.communicator->getProperties();
mCommunicator = Ice::initialize(IceBoxTestEnv.argc, IceBoxTestEnv.argv, data);
- mAdapter = mCommunicator->createObjectAdapterWithEndpoints("TestAdapter", "default");
+ mAdapter = mCommunicator->createObjectAdapterWithEndpoints("TestAdapter", "default -h 127.0.0.1");
//
// We will be making calls on proxies instantiated on this adapter, so we should activated here.
-----------------------------------------------------------------------
--
asterisk-scf/integration/mediatransportudptl.git
More information about the asterisk-scf-commits
mailing list