[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
Sun May 15 12:50:56 CDT 2011
branch "master" has been updated
via 9fee5b0a87b2ca58c6c4c4a9fd20dc4773217d2c (commit)
from 1178a5061d81b691a58ffc2ac79be859a5feeade (commit)
Summary of changes:
src/CMakeLists.txt | 3 +--
src/PJSipLoggingModule.cpp | 4 ++--
src/PJSipManager.cpp | 7 ++++---
src/PJSipManager.h | 10 +++++-----
src/PJSipModule.cpp | 5 +++--
src/PJSipSessionModule.cpp | 15 ++++++++-------
src/PJSipSessionModule.h | 10 +++++-----
src/PJSipSessionModuleConstruction.cpp | 4 ++--
src/SipConfiguration.cpp | 12 ++++++------
src/SipConfiguration.h | 4 ++--
src/SipEndpoint.cpp | 8 +++-----
src/SipEndpoint.h | 13 +++++++------
src/SipEndpointFactory.h | 3 +--
src/SipSession.cpp | 10 +++++-----
src/SipSession.h | 14 +++++++-------
src/SipSessionManagerApp.cpp | 24 ++++++++++++------------
src/SipSessionManagerEndpointLocator.cpp | 6 +++---
src/SipSessionManagerEndpointLocator.h | 4 ++--
src/SipSessionManagerEventPublisher.cpp | 4 ++--
src/SipStateReplicator.h | 26 ++++++++++++++++----------
src/SipStateReplicatorApp.cpp | 4 +++-
src/SipStateReplicatorListener.cpp | 16 +++++++---------
22 files changed, 106 insertions(+), 100 deletions(-)
- Log -----------------------------------------------------------------
commit 9fee5b0a87b2ca58c6c4c4a9fd20dc4773217d2c
Author: Brent Eagles <beagles at digium.com>
Date: Sun May 15 15:20:43 2011 -0230
Updates for ice-util-cpp changes.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c56d46f..202b875 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,8 +9,7 @@ if(OPENSSL_FOUND)
endif()
include_directories(${logger_dir}/include)
-include_directories(${utils_dir}/StateReplicator/include)
-include_directories(${utils_dir}/SmartProxy/include)
+include_directories(${utils_dir}/include)
include_directories(${API_INCLUDE_DIR})
asterisk_scf_slice_include_directories(${API_SLICE_DIR})
diff --git a/src/PJSipLoggingModule.cpp b/src/PJSipLoggingModule.cpp
index c94dec1..acfe04f 100644
--- a/src/PJSipLoggingModule.cpp
+++ b/src/PJSipLoggingModule.cpp
@@ -14,10 +14,10 @@
* at the top of the source tree.
*/
-#include <AsteriskSCF/logger.h>
-
#include "PJSipLoggingModule.h"
+#include <AsteriskSCF/logger.h>
+
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index 1b92c28..35a5c12 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -13,10 +13,11 @@
* the GNU General Public License Version 2. See the LICENSE.txt file
* at the top of the source tree.
*/
+
+#include "PJSipManager.h"
#include <AsteriskSCF/logger.h>
#include <boost/lexical_cast.hpp>
-#include "PJSipManager.h"
using namespace AsteriskSCF::System::Logging;
@@ -73,10 +74,10 @@ PJSipManager::PJSipManager(const Ice::PropertiesPtr& props)
}
void PJSipManager::registerSessionModule(const boost::shared_ptr<SipEndpointFactory>& endpointFactoryPtr,
- const AsteriskSCF::SmartProxy::SmartProxy<
+ const AsteriskSCF::Discovery::SmartProxy<
AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>& sessionRouter,
const AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx& serviceLocator,
- const AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
const AsteriskSCF::System::Component::V1::ReplicaPtr& replica
)
{
diff --git a/src/PJSipManager.h b/src/PJSipManager.h
index d188e11..bd084a0 100644
--- a/src/PJSipManager.h
+++ b/src/PJSipManager.h
@@ -18,14 +18,14 @@
#include <vector>
-#include <Ice/Ice.h>
-
#include <pjlib.h>
#include <pjsip.h>
+#include <Ice/Ice.h>
+
#include <boost/shared_ptr.hpp>
-#include <AsteriskSCF/SmartProxy.h>
+#include <AsteriskSCF/Discovery/SmartProxy.h>
#include "PJSipSessionModule.h"
#include "PJSipLoggingModule.h"
@@ -69,10 +69,10 @@ public:
* for basic call handling
*/
void registerSessionModule(const boost::shared_ptr<SipEndpointFactory>& endpointFactoryPtr,
- const AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>&
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>&
sessionRouter,
const AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx& serviceLocator,
- const AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
const AsteriskSCF::System::Component::V1::ReplicaPtr& replica
);
diff --git a/src/PJSipModule.cpp b/src/PJSipModule.cpp
index 0465a50..b545251 100644
--- a/src/PJSipModule.cpp
+++ b/src/PJSipModule.cpp
@@ -13,11 +13,12 @@
* the GNU General Public License Version 2. See the LICENSE.txt file
* at the top of the source tree.
*/
-#include <AsteriskSCF/logger.h>
-#include <IceUtil/UUID.h>
#include "PJSipModule.h"
+#include <AsteriskSCF/logger.h>
+#include <IceUtil/UUID.h>
+
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 4dbfefd..c71e656 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -13,13 +13,6 @@
* the GNU General Public License Version 2. See the LICENSE.txt file
* at the top of the source tree.
*/
-#include <IceUtil/UUID.h>
-
-#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
-#include <AsteriskSCF/Core/Routing/RoutingIf.h>
-#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
-#include <AsteriskSCF/Media/MediaIf.h>
-#include <AsteriskSCF/logger.h>
#include "PJSipSessionModule.h"
#include "SipEndpoint.h"
@@ -28,6 +21,14 @@
#include "PJSipManager.h"
#include "SipStateReplicator.h"
+#include <IceUtil/UUID.h>
+
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/Media/MediaIf.h>
+#include <AsteriskSCF/logger.h>
+
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/PJSipSessionModule.h b/src/PJSipSessionModule.h
index e22c31d..32a0e6e 100644
--- a/src/PJSipSessionModule.h
+++ b/src/PJSipSessionModule.h
@@ -23,7 +23,7 @@
#include <boost/thread.hpp>
#include <boost/thread/shared_mutex.hpp>
-#include <AsteriskSCF/SmartProxy.h>
+#include <AsteriskSCF/Discovery/SmartProxy.h>
#include <AsteriskSCF/System/Component/ReplicaIf.h>
#include "SipStateReplicator.h"
@@ -58,10 +58,10 @@ class PJSipSessionModule : public PJSipModule
{
public:
PJSipSessionModule(pjsip_endpoint *endpt, const boost::shared_ptr<SipEndpointFactory>& endpointFactoryPtr,
- const AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>&
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>&
sessionRouter,
const AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx& serviceLocator,
- const AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
const AsteriskSCF::System::Component::V1::ReplicaPtr& replica);
pj_status_t load(pjsip_endpoint *endpoint);
pj_status_t start();
@@ -91,9 +91,9 @@ private:
pjsip_ua_init_param mUaParam;
const std::string mName;
boost::shared_ptr<SipEndpointFactory> mEndpointFactory;
- AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> mSessionRouter;
+ AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx> mSessionRouter;
AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx mServiceLocator;
- AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> mStateReplicator;
+ AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx> mStateReplicator;
AsteriskSCF::System::Component::V1::ReplicaPtr mReplica;
pjsip_endpoint *mEndpoint;
};
diff --git a/src/PJSipSessionModuleConstruction.cpp b/src/PJSipSessionModuleConstruction.cpp
index f78c59d..b6aace3 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,
const boost::shared_ptr<SipEndpointFactory>& endpointFactoryPtr,
- const AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>& sessionRouter,
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>& sessionRouter,
const AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx& serviceLocator,
- const AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::SIP::V1::SipStateReplicatorPrx>& stateReplicator,
const AsteriskSCF::System::Component::V1::ReplicaPtr& replica)
: mName(moduleName), mEndpointFactory(endpointFactoryPtr),
mSessionRouter(sessionRouter), mServiceLocator(serviceLocator),
diff --git a/src/SipConfiguration.cpp b/src/SipConfiguration.cpp
index 76fa596..c437aa8 100644
--- a/src/SipConfiguration.cpp
+++ b/src/SipConfiguration.cpp
@@ -14,14 +14,14 @@
* at the top of the source tree.
*/
+#include <pjlib.h>
+#include <pjsip.h>
+
#include <IceUtil/UUID.h>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
-#include <pjlib.h>
-#include <pjsip.h>
-
#include <AsteriskSCF/System/Component/ConfigurationIf.h>
#include "SipConfigurationIf.h"
@@ -170,7 +170,7 @@ public:
* Constructor for this private class
*/
ConfigurationServiceImplPriv(PJSipManager *manager, boost::shared_ptr<SipEndpointFactory> factory, std::string& id,
- AsteriskSCF::SmartProxy::SmartProxy<LocatorRegistryPrx> registry) :
+ AsteriskSCF::Discovery::SmartProxy<LocatorRegistryPrx> registry) :
mPJSipManager(manager), mEndpointFactory(factory), mRoutingId(id), mRoutingServiceLocatorRegistry(registry) { };
/**
@@ -221,11 +221,11 @@ public:
/**
* Proxy to endpoint locator registry
*/
- AsteriskSCF::SmartProxy::SmartProxy<LocatorRegistryPrx> mRoutingServiceLocatorRegistry;
+ AsteriskSCF::Discovery::SmartProxy<LocatorRegistryPrx> mRoutingServiceLocatorRegistry;
};
ConfigurationServiceImpl::ConfigurationServiceImpl(PJSipManager *manager, boost::shared_ptr<SipEndpointFactory> factory,
- std::string& id, AsteriskSCF::SmartProxy::SmartProxy<LocatorRegistryPrx> registry) :
+ std::string& id, AsteriskSCF::Discovery::SmartProxy<LocatorRegistryPrx> registry) :
mImplPriv(new ConfigurationServiceImplPriv(manager, factory, id, registry))
{
}
diff --git a/src/SipConfiguration.h b/src/SipConfiguration.h
index d658614..d583bae 100644
--- a/src/SipConfiguration.h
+++ b/src/SipConfiguration.h
@@ -23,7 +23,7 @@
#include <AsteriskSCF/System/Component/ConfigurationIf.h>
#include <AsteriskSCF/Core/Routing/RoutingIf.h>
-#include <AsteriskSCF/SmartProxy.h>
+#include <AsteriskSCF/Discovery/SmartProxy.h>
#include "PJSipManager.h"
#include "SipEndpointFactory.h"
@@ -47,7 +47,7 @@ class ConfigurationServiceImpl : public AsteriskSCF::System::Configuration::V1::
{
public:
ConfigurationServiceImpl(PJSipManager*, boost::shared_ptr<SipEndpointFactory>, std::string&,
- AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::Core::Routing::V1::LocatorRegistryPrx>);
+ AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Core::Routing::V1::LocatorRegistryPrx>);
AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq getConfiguration(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq getConfigurationAll(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq getConfigurationGroups(const Ice::Current&);
diff --git a/src/SipEndpoint.cpp b/src/SipEndpoint.cpp
index 50d740e..e066cd4 100644
--- a/src/SipEndpoint.cpp
+++ b/src/SipEndpoint.cpp
@@ -13,17 +13,15 @@
* the GNU General Public License Version 2. See the LICENSE.txt file
* at the top of the source tree.
*/
-
+#include "PJSipManager.h"
+#include "SipEndpointFactory.h"
+#include "SipSession.h"
#include <Ice/Ice.h>
#include <IceUtil/UUID.h>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include <AsteriskSCF/logger.h>
-#include "PJSipManager.h"
-#include "SipEndpointFactory.h"
-#include "SipSession.h"
-
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/SipEndpoint.h b/src/SipEndpoint.h
index fc3aa21..1eb9680 100644
--- a/src/SipEndpoint.h
+++ b/src/SipEndpoint.h
@@ -16,6 +16,13 @@
#pragma once
+#include <pjsip.h>
+#include <pjmedia.h>
+#include <pjsip_ua.h>
+#include <pjsip_simple.h>
+#include <pjlib-util.h>
+#include <pjlib.h>
+
#include <Ice/Ice.h>
#include <boost/thread.hpp>
@@ -28,12 +35,6 @@
#include "SipSession.h"
-#include <pjsip.h>
-#include <pjmedia.h>
-#include <pjsip_ua.h>
-#include <pjsip_simple.h>
-#include <pjlib-util.h>
-#include <pjlib.h>
namespace AsteriskSCF
{
diff --git a/src/SipEndpointFactory.h b/src/SipEndpointFactory.h
index 6431604..48cfd97 100644
--- a/src/SipEndpointFactory.h
+++ b/src/SipEndpointFactory.h
@@ -16,13 +16,12 @@
#pragma once
+#include "SipEndpoint.h"
#include <Ice/Ice.h>
#include <boost/enable_shared_from_this.hpp>
#include <AsteriskSCF/Core/Endpoint/EndpointIf.h>
-#include "SipEndpoint.h"
-
namespace AsteriskSCF
{
namespace SipSessionManager
diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index 0eafdfc..2b36d1f 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -14,6 +14,11 @@
* at the top of the source tree.
*/
+#include "PJSipManager.h"
+#include "SipEndpointFactory.h"
+#include "SipEndpoint.h"
+#include "SipSession.h"
+
#include <Ice/Ice.h>
#include <IceUtil/UUID.h>
@@ -22,11 +27,6 @@
#include <AsteriskSCF/logger.h>
-#include "PJSipManager.h"
-#include "SipEndpointFactory.h"
-#include "SipEndpoint.h"
-#include "SipSession.h"
-
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/SipSession.h b/src/SipSession.h
index 3596260..643e70e 100644
--- a/src/SipSession.h
+++ b/src/SipSession.h
@@ -16,6 +16,13 @@
#pragma once
+#include <pjsip.h>
+#include <pjmedia.h>
+#include <pjsip_ua.h>
+#include <pjsip_simple.h>
+#include <pjlib-util.h>
+#include <pjlib.h>
+
#include <Ice/Ice.h>
#include <boost/thread.hpp>
@@ -29,13 +36,6 @@
#include <SipStateReplicationIf.h>
-#include <pjsip.h>
-#include <pjmedia.h>
-#include <pjsip_ua.h>
-#include <pjsip_simple.h>
-#include <pjlib-util.h>
-#include <pjlib.h>
-
namespace AsteriskSCF
{
diff --git a/src/SipSessionManagerApp.cpp b/src/SipSessionManagerApp.cpp
index 18b12d5..a19249d 100644
--- a/src/SipSessionManagerApp.cpp
+++ b/src/SipSessionManagerApp.cpp
@@ -14,6 +14,8 @@
* at the top of the source tree.
*/
+#include <pjlib.h>
+
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
#include <IceBox/IceBox.h>
@@ -21,14 +23,13 @@
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
-#include <pjlib.h>
#include <AsteriskSCF/Core/Routing/RoutingIf.h>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include <AsteriskSCF/System/Component/ComponentServiceIf.h>
#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
#include <AsteriskSCF/System/Component/ReplicaIf.h>
-#include <AsteriskSCF/SmartProxy.h>
+#include <AsteriskSCF/Discovery/SmartProxy.h>
#include <AsteriskSCF/System/Component/ConfigurationIf.h>
#include <AsteriskSCF/Logger/IceLogger.h>
@@ -51,7 +52,6 @@ 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::SmartProxy;
using namespace AsteriskSCF::System::Configuration::V1;
namespace
@@ -90,7 +90,7 @@ private:
void initialize(const string& appName, const Ice::CommunicatorPtr& ic);
void registerWithServiceLocator();
void deregisterFromServiceLocator();
- void setCategory(const Discovery::V1::ServiceManagementPrx& serviceManagement, const string &category);
+ void setCategory(const ServiceManagementPrx& serviceManagement, const string &category);
void locateRoutingService();
void locateSessionRouter();
void locateStateReplicator();
@@ -115,7 +115,7 @@ private:
ServiceLocatorManagementPrx mServiceLocatorManagement;
- Discovery::V1::ServiceManagementPrx mComponentServiceManagement;
+ ServiceManagementPrx mComponentServiceManagement;
ReplicaPtr mReplicaService;
ComponentServicePtr mComponentService;
ConfigurationServicePtr mConfigurationService;
@@ -124,9 +124,9 @@ private:
SipStateReplicatorListenerPrx mReplicatorListenerProxy;
boost::shared_ptr<SipEndpointFactory> mEndpointFactory;
ServiceLocatorPrx mServiceLocator;
- AsteriskSCF::SmartProxy::SmartProxy<SipStateReplicatorPrx> mStateReplicator;
- AsteriskSCF::SmartProxy::SmartProxy<SessionRouterPrx> mSessionRouter;
- AsteriskSCF::SmartProxy::SmartProxy<LocatorRegistryPrx> mRoutingServiceLocatorRegistry;
+ AsteriskSCF::Discovery::SmartProxy<SipStateReplicatorPrx> mStateReplicator;
+ AsteriskSCF::Discovery::SmartProxy<SessionRouterPrx> mSessionRouter;
+ AsteriskSCF::Discovery::SmartProxy<LocatorRegistryPrx> mRoutingServiceLocatorRegistry;
boost::shared_ptr<SipSessionManagerEventPublisher> mEventPublisher;
Routing::V1::EndpointLocatorPtr mEndpointLocator;
};
@@ -286,7 +286,7 @@ private:
* Helper function to add some parameters to one of our registered interfaces in the ServiceLocator, so that
* other components can look up our interfaces.
*/
-void SipSessionManager::setCategory(const Discovery::V1::ServiceManagementPrx& serviceManagement, const string &category)
+void SipSessionManager::setCategory(const ServiceManagementPrx& serviceManagement, const string &category)
{
// Add category as a parameter to enable other components look this component up.
ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
@@ -371,7 +371,7 @@ void SipSessionManager::locateRoutingService()
ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
genericparams->category = Routing::V1::RoutingServiceLocatorRegistryDiscoveryCategory;
- AsteriskSCF::SmartProxy::SmartProxy<LocatorRegistryPrx> pw(mServiceLocator, genericparams, lg);
+ AsteriskSCF::Discovery::SmartProxy<LocatorRegistryPrx> pw(mServiceLocator, genericparams, lg);
mRoutingServiceLocatorRegistry = pw;
// This exists here since it may need to be known before actually contacting the routing service
@@ -392,7 +392,7 @@ void SipSessionManager::locateStateReplicator()
try
{
- AsteriskSCF::SmartProxy::SmartProxy<SipStateReplicatorPrx> pw(mServiceLocator, replicatorParams, lg);
+ AsteriskSCF::Discovery::SmartProxy<SipStateReplicatorPrx> pw(mServiceLocator, replicatorParams, lg);
mStateReplicator = pw;
}
catch (...)
@@ -429,7 +429,7 @@ void SipSessionManager::locateSessionRouter()
ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
genericparams->category = Routing::V1::SessionRouterDiscoveryCategory;
- AsteriskSCF::SmartProxy::SmartProxy<SessionRouterPrx> pw(mServiceLocator, genericparams, lg);
+ AsteriskSCF::Discovery::SmartProxy<SessionRouterPrx> pw(mServiceLocator, genericparams, lg);
mSessionRouter = pw;
}
diff --git a/src/SipSessionManagerEndpointLocator.cpp b/src/SipSessionManagerEndpointLocator.cpp
index 3fd8679..59bcc2c 100644
--- a/src/SipSessionManagerEndpointLocator.cpp
+++ b/src/SipSessionManagerEndpointLocator.cpp
@@ -14,13 +14,13 @@
* at the top of the source tree.
*/
-#include <boost/thread.hpp>
-#include <boost/shared_ptr.hpp>
-
#include "SipEndpointFactory.h"
#include "SipSessionManagerEndpointLocator.h"
#include "SipEndpoint.h"
+#include <boost/thread.hpp>
+#include <boost/shared_ptr.hpp>
+
namespace AsteriskSCF
{
namespace SipSessionManager
diff --git a/src/SipSessionManagerEndpointLocator.h b/src/SipSessionManagerEndpointLocator.h
index 68b1cdd..d704d3c 100644
--- a/src/SipSessionManagerEndpointLocator.h
+++ b/src/SipSessionManagerEndpointLocator.h
@@ -16,10 +16,10 @@
#pragma once
-#include <AsteriskSCF/Core/Routing/RoutingIf.h>
-
#include "SipEndpointFactory.h"
+#include <AsteriskSCF/Core/Routing/RoutingIf.h>
+
namespace AsteriskSCF
{
namespace SipSessionManager
diff --git a/src/SipSessionManagerEventPublisher.cpp b/src/SipSessionManagerEventPublisher.cpp
index 794eb5b..a716072 100644
--- a/src/SipSessionManagerEventPublisher.cpp
+++ b/src/SipSessionManagerEventPublisher.cpp
@@ -14,13 +14,13 @@
* at the top of the source tree.
*/
+#include "SipSessionManagerEventPublisher.h"
+
#include <Ice/Ice.h>
#include <IceStorm/IceStorm.h>
#include <AsteriskSCF/logger.h>
-#include "SipSessionManagerEventPublisher.h"
-
using namespace ::std;
using namespace ::AsteriskSCF::SIP::V1;
using namespace AsteriskSCF::System::Logging;
diff --git a/src/SipStateReplicator.h b/src/SipStateReplicator.h
index 707f67c..02fde05 100644
--- a/src/SipStateReplicator.h
+++ b/src/SipStateReplicator.h
@@ -16,32 +16,38 @@
#pragma once
+#include "SipEndpointFactory.h"
#include <Ice/Ice.h>
-
-#include <AsteriskSCF/StateReplicator.h>
+#include <AsteriskSCF/Replication/StateReplicator.h>
#include <SipStateReplicationIf.h>
-#include "SipEndpointFactory.h"
+
+#include <boost/shared_ptr.hpp>
namespace AsteriskSCF
{
namespace SipSessionManager
{
-using namespace AsteriskSCF::SIP::V1;
-typedef AsteriskSCF::StateReplication::StateReplicator<SipStateReplicator, SipStateItemPtr, std::string,
- SipStateReplicatorListenerPrx> SipStateReplicatorI;
+typedef AsteriskSCF::Replication::StateReplicator<
+ AsteriskSCF::SIP::V1::SipStateReplicator,
+ AsteriskSCF::SIP::V1::SipStateItemPtr, std::string,
+ AsteriskSCF::SIP::V1::SipStateReplicatorListenerPrx> SipStateReplicatorI;
typedef IceUtil::Handle<SipStateReplicatorI> SipStateReplicatorIPtr;
-class SipStateReplicatorListenerI : public SipStateReplicatorListener
+//
+// Forward declarations.
+//
+struct SipStateReplicatorListenerImpl;
+
+class SipStateReplicatorListenerI : public AsteriskSCF::SIP::V1::SipStateReplicatorListener
{
public:
SipStateReplicatorListenerI(const boost::shared_ptr<SipEndpointFactory>& factory, PJSipManager *manager);
- ~SipStateReplicatorListenerI();
void stateRemoved(const Ice::StringSeq&, const Ice::Current&);
- void stateSet(const SipStateItemSeq&, const Ice::Current&);
+ void stateSet(const AsteriskSCF::SIP::V1::SipStateItemSeq&, const Ice::Current&);
bool operator==(const SipStateReplicatorListenerI &rhs);
private:
- struct SipStateReplicatorListenerImpl *mImpl;
+ boost::shared_ptr<SipStateReplicatorListenerImpl> mImpl;
};
};
diff --git a/src/SipStateReplicatorApp.cpp b/src/SipStateReplicatorApp.cpp
index 9ad6f2b..c6cb96a 100644
--- a/src/SipStateReplicatorApp.cpp
+++ b/src/SipStateReplicatorApp.cpp
@@ -14,6 +14,8 @@
* at the top of the source tree.
*/
+#include "SipStateReplicator.h"
+
#include <Ice/Ice.h>
#include <IceUtil/UUID.h>
#include <IceStorm/IceStorm.h>
@@ -25,11 +27,11 @@
#include <AsteriskSCF/Logger/IceLogger.h>
#include <SipIf.h>
-#include "SipStateReplicator.h"
using namespace std;
using namespace AsteriskSCF::Core;
using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::SIP::V1;
using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::SipSessionManager;
diff --git a/src/SipStateReplicatorListener.cpp b/src/SipStateReplicatorListener.cpp
index 248e9b2..5cb7bb5 100644
--- a/src/SipStateReplicatorListener.cpp
+++ b/src/SipStateReplicatorListener.cpp
@@ -14,17 +14,17 @@
* at the top of the source tree.
*/
-#include <IceUtil/UUID.h>
-
-#include <boost/thread.hpp>
-#include <boost/shared_ptr.hpp>
-
#include "SipStateReplicator.h"
#include "SipEndpoint.h"
#include "SipEndpointFactory.h"
#include "SipSession.h"
#include "PJSipManager.h"
+#include <IceUtil/UUID.h>
+
+#include <boost/thread.hpp>
+#include <boost/shared_ptr.hpp>
+
namespace AsteriskSCF
{
namespace SipSessionManager
@@ -267,13 +267,11 @@ public:
SipStateReplicatorListenerI::SipStateReplicatorListenerI(const boost::shared_ptr<SipEndpointFactory>& factory,
PJSipManager *manager)
- : mImpl(new SipStateReplicatorListenerImpl(factory, manager)) {}
-
-SipStateReplicatorListenerI::~SipStateReplicatorListenerI()
+ : mImpl(new SipStateReplicatorListenerImpl(factory, manager))
{
- delete mImpl;
}
+
void SipStateReplicatorListenerI::stateRemoved(const Ice::StringSeq& itemKeys, const Ice::Current&)
{
mImpl->removeStateNoticeImpl(itemKeys);
-----------------------------------------------------------------------
--
asterisk-scf/release/sip.git
More information about the asterisk-scf-commits
mailing list