[asterisk-scf-commits] asterisk-scf/release/sip.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Dec 3 10:04:33 CST 2010
branch "master" has been updated
via 99d7471b6dd6acdbe5260ebe9f9d03fa0577b162 (commit)
from 194e0aec2c80aa29bc392bdd75ee0939ea913bc6 (commit)
Summary of changes:
src/CMakeLists.txt | 5 ++---
src/PJSipManager.cpp | 4 ++--
src/PJSipManager.h | 6 +++---
src/PJSipSessionModule.h | 10 +++++-----
src/PJSipSessionModuleConstruction.cpp | 4 ++--
src/SipSessionManagerApp.cpp | 16 ++++++++--------
6 files changed, 22 insertions(+), 23 deletions(-)
- Log -----------------------------------------------------------------
commit 99d7471b6dd6acdbe5260ebe9f9d03fa0577b162
Author: David M. Lee <dlee at digium.com>
Date: Mon Nov 29 09:03:54 2010 -0600
ProxyWrapper -> SmartProxy
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 15cb230..413cab4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ asterisk_scf_component_add_file(SipSessionManager SipStateReplicator.h)
asterisk_scf_component_add_ice_libraries(SipSessionManager IceStorm)
-asterisk_scf_component_add_boost_libraries(SipSessionManager thread core)
+asterisk_scf_component_add_boost_libraries(SipSessionManager core)
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
@@ -74,14 +74,13 @@ asterisk_scf_component_add_slice(SipStateReplicator MediaRTPIf)
#permanent of changes and assumes the directories are
#structured in the way that gitall structures them.
include_directories(${utils_dir}/StateReplicator/src)
-include_directories(${utils_dir}/ProxyWrapper/src)
+include_directories(${utils_dir}/SmartProxy/src)
asterisk_scf_component_add_file(SipStateReplicator SipStateReplicatorApp.cpp)
asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.h)
#asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.cpp)
asterisk_scf_component_add_ice_libraries(SipStateReplicator IceStorm)
-asterisk_scf_component_add_boost_libraries(SipStateReplicator thread)
asterisk_scf_component_build_icebox(SipStateReplicator)
target_link_libraries(SipStateReplicator logging-client)
diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index 4270766..8d299d7 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -72,9 +72,9 @@ PJSipManager::PJSipManager(Ice::PropertiesPtr props)
void PJSipManager::registerSessionModule(pjsip_endpoint *endpt,
boost::shared_ptr<SipEndpointFactory> endpointFactoryPtr,
- AsteriskSCF::ProxyWrapper::ProxyWrapper<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> sessionRouter,
+ AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> sessionRouter,
AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx serviceLocator,
- AsteriskSCF::ProxyWrapper::ProxyWrapper<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> stateReplicator,
+ AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> stateReplicator,
AsteriskSCF::System::Component::V1::ReplicaPtr replica
)
{
diff --git a/src/PJSipManager.h b/src/PJSipManager.h
index 7cc5220..6340407 100644
--- a/src/PJSipManager.h
+++ b/src/PJSipManager.h
@@ -26,7 +26,7 @@
#include <boost/shared_ptr.hpp>
#include "PJSipSessionModule.h"
#include "PJSipLoggingModule.h"
-#include "ProxyWrapper.h"
+#include "SmartProxy.h"
namespace AsteriskSCF
{
@@ -68,9 +68,9 @@ public:
*/
void registerSessionModule(pjsip_endpoint *endpt,
boost::shared_ptr<SipEndpointFactory> endpointFactoryPtr,
- AsteriskSCF::ProxyWrapper::ProxyWrapper<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> sessionRouter,
+ AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> sessionRouter,
AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx serviceLocator,
- AsteriskSCF::ProxyWrapper::ProxyWrapper<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> stateReplicator,
+ AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> stateReplicator,
AsteriskSCF::System::Component::V1::ReplicaPtr replica
);
diff --git a/src/PJSipSessionModule.h b/src/PJSipSessionModule.h
index ef5c165..270849d 100644
--- a/src/PJSipSessionModule.h
+++ b/src/PJSipSessionModule.h
@@ -27,7 +27,7 @@
#include "SipSession.h"
#include "PJSipModule.h"
#include "ReplicaIf.h"
-#include "ProxyWrapper.h"
+#include "SmartProxy.h"
namespace AsteriskSCF
{
@@ -57,9 +57,9 @@ class PJSipSessionModule : public PJSipModule
{
public:
PJSipSessionModule(pjsip_endpoint *endpt, boost::shared_ptr<SipEndpointFactory> endpointFactoryPtr,
- AsteriskSCF::ProxyWrapper::ProxyWrapper<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> sessionRouter,
+ AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> sessionRouter,
AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx serviceLocator,
- AsteriskSCF::ProxyWrapper::ProxyWrapper<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> stateReplicator,
+ AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> stateReplicator,
AsteriskSCF::System::Component::V1::ReplicaPtr replica);
pj_status_t load(pjsip_endpoint *endpoint);
pj_status_t start();
@@ -89,9 +89,9 @@ private:
pjsip_ua_init_param mUaParam;
const std::string mName;
boost::shared_ptr<SipEndpointFactory> mEndpointFactory;
- AsteriskSCF::ProxyWrapper::ProxyWrapper<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> mSessionRouter;
+ AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> mSessionRouter;
AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx mServiceLocator;
- AsteriskSCF::ProxyWrapper::ProxyWrapper<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> mStateReplicator;
+ AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> mStateReplicator;
AsteriskSCF::System::Component::V1::ReplicaPtr mReplica;
};
diff --git a/src/PJSipSessionModuleConstruction.cpp b/src/PJSipSessionModuleConstruction.cpp
index 14f1fe5..e6cebaf 100644
--- a/src/PJSipSessionModuleConstruction.cpp
+++ b/src/PJSipSessionModuleConstruction.cpp
@@ -93,9 +93,9 @@ static pjsip_dialog *uaOnDialogForked(pjsip_dialog *first_set, pjsip_rx_data *rd
PJSipSessionModule::PJSipSessionModule(pjsip_endpoint *endpt,
boost::shared_ptr<SipEndpointFactory> endpointFactoryPtr,
- AsteriskSCF::ProxyWrapper::ProxyWrapper<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> sessionRouter,
+ AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> sessionRouter,
AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx serviceLocator,
- AsteriskSCF::ProxyWrapper::ProxyWrapper<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> stateReplicator,
+ AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> stateReplicator,
AsteriskSCF::System::Component::V1::ReplicaPtr replica)
: mName(moduleName), mEndpointFactory(endpointFactoryPtr),
mSessionRouter(sessionRouter), mServiceLocator(serviceLocator),
diff --git a/src/SipSessionManagerApp.cpp b/src/SipSessionManagerApp.cpp
index 74348e5..e185bba 100644
--- a/src/SipSessionManagerApp.cpp
+++ b/src/SipSessionManagerApp.cpp
@@ -38,7 +38,7 @@
#include "PJSipManager.h"
#include "SipSession.h"
#include "SipStateReplicator.h"
-#include "ProxyWrapper.h"
+#include "SmartProxy.h"
using namespace std;
using namespace AsteriskSCF::SipSessionManager;
@@ -48,7 +48,7 @@ using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SessionCommunications::V1;
-using namespace AsteriskSCF::ProxyWrapper;
+using namespace AsteriskSCF::SmartProxy;
namespace
{
@@ -118,9 +118,9 @@ private:
SipStateReplicatorListenerPrx mReplicatorListenerProxy;
boost::shared_ptr<SipEndpointFactory> mEndpointFactory;
ServiceLocatorPrx mServiceLocator;
- AsteriskSCF::ProxyWrapper::ProxyWrapper<SipStateReplicatorPrx> mStateReplicator;
- AsteriskSCF::ProxyWrapper::ProxyWrapper<SessionRouterPrx> mSessionRouter;
- AsteriskSCF::ProxyWrapper::ProxyWrapper<LocatorRegistryPrx> mRoutingServiceLocatorRegistry;
+ AsteriskSCF::SmartProxy::SmartProxy<SipStateReplicatorPrx> mStateReplicator;
+ AsteriskSCF::SmartProxy::SmartProxy<SessionRouterPrx> mSessionRouter;
+ AsteriskSCF::SmartProxy::SmartProxy<LocatorRegistryPrx> mRoutingServiceLocatorRegistry;
boost::shared_ptr<SipSessionManagerEventPublisher> mEventPublisher;
Routing::V1::EndpointLocatorPtr mEndpointLocator;
};
@@ -357,7 +357,7 @@ void SipSessionManager::locateRoutingService()
ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
genericparams->category = Routing::V1::RoutingServiceLocatorRegistryDiscoveryCategory;
- AsteriskSCF::ProxyWrapper::ProxyWrapper<LocatorRegistryPrx> pw(mServiceLocator, genericparams);
+ AsteriskSCF::SmartProxy::SmartProxy<LocatorRegistryPrx> pw(mServiceLocator, genericparams, lg);
mRoutingServiceLocatorRegistry = pw;
}
@@ -374,7 +374,7 @@ void SipSessionManager::locateStateReplicator()
try
{
- AsteriskSCF::ProxyWrapper::ProxyWrapper<SipStateReplicatorPrx> pw(mServiceLocator, replicatorParams);
+ AsteriskSCF::SmartProxy::SmartProxy<SipStateReplicatorPrx> pw(mServiceLocator, replicatorParams, lg);
mStateReplicator = pw;
}
catch (...)
@@ -411,7 +411,7 @@ void SipSessionManager::locateSessionRouter()
ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
genericparams->category = Routing::V1::SessionRouterDiscoveryCategory;
- AsteriskSCF::ProxyWrapper::ProxyWrapper<SessionRouterPrx> pw(mServiceLocator, genericparams);
+ AsteriskSCF::SmartProxy::SmartProxy<SessionRouterPrx> pw(mServiceLocator, genericparams, lg);
mSessionRouter = pw;
}
-----------------------------------------------------------------------
--
asterisk-scf/release/sip.git
More information about the asterisk-scf-commits
mailing list