[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 30 14:50:20 CST 2011
branch "master" has been updated
via 20bb5be857d5c414305cfce89ffa15a1cc9e2e3c (commit)
via 25975e396af5734953cd1b13476f439872113a3b (commit)
via 306d97333fcc6cd2f83219f9739a786164d6e866 (commit)
via 7552d2d7372870b6504e7d5459fe23d8925fedac (commit)
from fb4c184ad83d54886cfe7c50f01e2fb726592a8c (commit)
Summary of changes:
.../SIPConfigurationIf.ice} | 98 ++--
.../SIPStateReplicationIf.ice} | 50 +-
.../SIPSessionCookiesIf.ice} | 4 +-
slice/{SipIf.ice => SIPIf.ice} | 6 +-
src/AuthManager.cpp | 2 +-
src/AuthManager.h | 6 +-
src/CMakeLists.txt | 176 ++++----
src/Component.cpp | 150 +++---
src/NATOptions.h | 4 +-
src/{PJSipDummyModule.h => PJSIPDummyModule.h} | 8 +-
...uction.cpp => PJSIPDummyModuleConstruction.cpp} | 8 +-
...SipLoggingModule.cpp => PJSIPLoggingModule.cpp} | 28 +-
src/{PJSipLoggingModule.h => PJSIPLoggingModule.h} | 10 +-
...tion.cpp => PJSIPLoggingModuleConstruction.cpp} | 8 +-
src/{PJSipManager.cpp => PJSIPManager.cpp} | 82 ++--
src/{PJSipManager.h => PJSIPManager.h} | 66 ++--
src/{PJSipModule.cpp => PJSIPModule.cpp} | 34 +-
src/{PJSipModule.h => PJSIPModule.h} | 30 +-
...egistrarModule.cpp => PJSIPRegistrarModule.cpp} | 72 ++--
...SipRegistrarModule.h => PJSIPRegistrarModule.h} | 22 +-
...on.cpp => PJSIPRegistrarModuleConstruction.cpp} | 12 +-
...SipSessionModule.cpp => PJSIPSessionModule.cpp} | 324 +++++++-------
src/{PJSipSessionModule.h => PJSIPSessionModule.h} | 102 ++--
...tion.cpp => PJSIPSessionModuleConstruction.cpp} | 48 +-
src/PJUtil.h | 4 +-
...tRegistration.cpp => SIPClientRegistration.cpp} | 58 ++--
...lientRegistration.h => SIPClientRegistration.h} | 34 +-
src/{SipConfiguration.cpp => SIPConfiguration.cpp} | 428 +++++++++---------
src/{SipConfiguration.h => SIPConfiguration.h} | 14 +-
src/{SipEndpoint.cpp => SIPEndpoint.cpp} | 174 ++++----
src/{SipEndpoint.h => SIPEndpoint.h} | 96 ++--
...pEndpointFactory.cpp => SIPEndpointFactory.cpp} | 38 +-
src/{SipEndpointFactory.h => SIPEndpointFactory.h} | 30 +-
src/{SipModule.h => SIPModule.h} | 16 +-
...istrarListener.cpp => SIPRegistrarListener.cpp} | 44 +-
...pRegistrarListener.h => SIPRegistrarListener.h} | 18 +-
...eplicationContext.h => SIPReplicationContext.h} | 14 +-
src/{SipSession.cpp => SIPSession.cpp} | 500 ++++++++++----------
src/{SipSession.h => SIPSession.h} | 100 ++--
...or.cpp => SIPSessionManagerEndpointLocator.cpp} | 18 +-
...ocator.h => SIPSessionManagerEndpointLocator.h} | 12 +-
...her.cpp => SIPSessionManagerEventPublisher.cpp} | 30 +-
...blisher.h => SIPSessionManagerEventPublisher.h} | 14 +-
src/SIPStateReplicator.h | 61 +++
...ReplicatorApp.cpp => SIPStateReplicatorApp.cpp} | 50 +-
...Listener.cpp => SIPStateReplicatorListener.cpp} | 138 +++---
...honyEventSink.cpp => SIPTelephonyEventSink.cpp} | 24 +-
...elephonyEventSink.h => SIPTelephonyEventSink.h} | 10 +-
...EventSource.cpp => SIPTelephonyEventSource.cpp} | 32 +-
...honyEventSource.h => SIPTelephonyEventSource.h} | 10 +-
src/{SipTransfer.cpp => SIPTransfer.cpp} | 52 +-
src/{SipTransfer.h => SIPTransfer.h} | 38 +-
src/STUNModule.cpp | 14 +-
src/STUNModule.h | 16 +-
src/STUNTransport.cpp | 10 +-
src/STUNTransport.h | 10 +-
src/STUNTransportConfig.cpp | 34 +-
src/STUNTransportConfig.h | 16 +-
src/SipStateReplicator.h | 61 ---
src/TCPTransport.cpp | 6 +-
src/TCPTransport.h | 10 +-
src/TLSTransport.cpp | 10 +-
src/TLSTransport.h | 10 +-
src/Transports.cpp | 2 +-
src/Transports.h | 8 +-
src/UDPTransport.cpp | 6 +-
src/UDPTransport.h | 10 +-
67 files changed, 1815 insertions(+), 1815 deletions(-)
rename slice/AsteriskSCF/Configuration/{SipSessionManager/SipConfigurationIf.ice => SIPSessionManager/SIPConfigurationIf.ice} (78%)
rename slice/AsteriskSCF/Replication/{SipSessionManager/SipStateReplicationIf.ice => SIPSessionManager/SIPStateReplicationIf.ice} (81%)
rename slice/AsteriskSCF/SessionCookies/{SipSessionManager/SipSessionCookiesIf.ice => SIPSessionManager/SIPSessionCookiesIf.ice} (95%)
rename slice/{SipIf.ice => SIPIf.ice} (89%)
rename src/{PJSipDummyModule.h => PJSIPDummyModule.h} (82%)
rename src/{PJSipDummyModuleConstruction.cpp => PJSIPDummyModuleConstruction.cpp} (93%)
rename src/{PJSipLoggingModule.cpp => PJSIPLoggingModule.cpp} (65%)
rename src/{PJSipLoggingModule.h => PJSIPLoggingModule.h} (82%)
rename src/{PJSipLoggingModuleConstruction.cpp => PJSIPLoggingModuleConstruction.cpp} (93%)
rename src/{PJSipManager.cpp => PJSIPManager.cpp} (74%)
rename src/{PJSipManager.h => PJSIPManager.h} (69%)
rename src/{PJSipModule.cpp => PJSIPModule.cpp} (86%)
rename src/{PJSipModule.h => PJSIPModule.h} (79%)
rename src/{PJSipRegistrarModule.cpp => PJSIPRegistrarModule.cpp} (93%)
rename src/{PJSipRegistrarModule.h => PJSIPRegistrarModule.h} (93%)
rename src/{PJSipRegistrarModuleConstruction.cpp => PJSIPRegistrarModuleConstruction.cpp} (90%)
rename src/{PJSipSessionModule.cpp => PJSIPSessionModule.cpp} (88%)
rename src/{PJSipSessionModule.h => PJSIPSessionModule.h} (82%)
rename src/{PJSipSessionModuleConstruction.cpp => PJSIPSessionModuleConstruction.cpp} (81%)
rename src/{SipClientRegistration.cpp => SIPClientRegistration.cpp} (84%)
rename src/{SipClientRegistration.h => SIPClientRegistration.h} (85%)
rename src/{SipConfiguration.cpp => SIPConfiguration.cpp} (79%)
rename src/{SipConfiguration.h => SIPConfiguration.h} (81%)
rename src/{SipEndpoint.cpp => SIPEndpoint.cpp} (84%)
rename src/{SipEndpoint.h => SIPEndpoint.h} (83%)
rename src/{SipEndpointFactory.cpp => SIPEndpointFactory.cpp} (70%)
rename src/{SipEndpointFactory.h => SIPEndpointFactory.h} (75%)
rename src/{SipModule.h => SIPModule.h} (81%)
rename src/{SipRegistrarListener.cpp => SIPRegistrarListener.cpp} (72%)
rename src/{SipRegistrarListener.h => SIPRegistrarListener.h} (70%)
rename src/{SipReplicationContext.h => SIPReplicationContext.h} (84%)
rename src/{SipSession.cpp => SIPSession.cpp} (91%)
rename src/{SipSession.h => SIPSession.h} (85%)
rename src/{SipSessionManagerEndpointLocator.cpp => SIPSessionManagerEndpointLocator.cpp} (82%)
rename src/{SipSessionManagerEndpointLocator.h => SIPSessionManagerEndpointLocator.h} (84%)
rename src/{SipSessionManagerEventPublisher.cpp => SIPSessionManagerEventPublisher.cpp} (79%)
rename src/{SipSessionManagerEventPublisher.h => SIPSessionManagerEventPublisher.h} (79%)
create mode 100644 src/SIPStateReplicator.h
rename src/{SipStateReplicatorApp.cpp => SIPStateReplicatorApp.cpp} (88%)
rename src/{SipStateReplicatorListener.cpp => SIPStateReplicatorListener.cpp} (85%)
rename src/{SipTelephonyEventSink.cpp => SIPTelephonyEventSink.cpp} (92%)
rename src/{SipTelephonyEventSink.h => SIPTelephonyEventSink.h} (87%)
rename src/{SipTelephonyEventSource.cpp => SIPTelephonyEventSource.cpp} (81%)
rename src/{SipTelephonyEventSource.h => SIPTelephonyEventSource.h} (89%)
rename src/{SipTransfer.cpp => SIPTransfer.cpp} (94%)
rename src/{SipTransfer.h => SIPTransfer.h} (91%)
delete mode 100644 src/SipStateReplicator.h
- Log -----------------------------------------------------------------
commit 20bb5be857d5c414305cfce89ffa15a1cc9e2e3c
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Dec 29 11:00:05 2011 -0600
Adjust names in media_rtp_pjmedia
diff --git a/src/Component.cpp b/src/Component.cpp
index 9f39666..904fd84 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -32,7 +32,7 @@
#include <AsteriskSCF/Logger/IceLogger.h>
#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Component/Component.h>
-#include <AsteriskSCF/PJLib/ThreadHook.h>
+#include <AsteriskSCF/PJLIB/ThreadHook.h>
#include <AsteriskSCF/Replication/ReplicationContext.h>
#include "SIPSessionManagerEventPublisher.h"
@@ -420,7 +420,7 @@ void Component::onPreInitialize()
//we're going to create our own so that we can provide it with a threadhook.
//Yes, this could be done via a plugin, but this is easier. Go away.
Ice::InitializationData id;
- id.threadHook = new AsteriskSCF::PJLib::ThreadHook("Ice");
+ id.threadHook = new AsteriskSCF::PJLIB::ThreadHook("Ice");
id.properties = getCommunicator()->getProperties();
// Initialize PJSIP
diff --git a/src/PJSIPRegistrarModule.cpp b/src/PJSIPRegistrarModule.cpp
index e67c5c9..3a35e25 100644
--- a/src/PJSIPRegistrarModule.cpp
+++ b/src/PJSIPRegistrarModule.cpp
@@ -19,7 +19,7 @@
#include <AsteriskSCF/System/WorkQueue/WorkQueueIf.h>
#include <AsteriskSCF/WorkQueue/WorkQueue.h>
#include <AsteriskSCF/WorkQueue/DefaultQueueListener.h>
-#include <AsteriskSCF/PJLib/ThreadHook.h>
+#include <AsteriskSCF/PJLIB/ThreadHook.h>
#include "PJSIPRegistrarModule.h"
#include "PJSIPManager.h"
@@ -151,7 +151,7 @@ RegistrarI::RegistrarI(const RegistrarListenerPrx& defaultListener)
lg(Debug) << "In RegistrarI constructor, should be adding a listener...";
mQueue = new AsteriskSCF::WorkQueue::WorkQueue();
AsteriskSCF::WorkQueue::DefaultQueueListenerPtr listener(new AsteriskSCF::WorkQueue::DefaultQueueListener(mQueue,
- new AsteriskSCF::PJLib::ThreadHook("SIP Registrar Module Pool")));
+ new AsteriskSCF::PJLIB::ThreadHook("SIP Registrar Module Pool")));
mQueue->setListener(listener);
mListeners.push_back(defaultListener);
}
diff --git a/src/PJSIPSessionModule.cpp b/src/PJSIPSessionModule.cpp
index 9fdddd4..fabcaf3 100644
--- a/src/PJSIPSessionModule.cpp
+++ b/src/PJSIPSessionModule.cpp
@@ -2072,7 +2072,7 @@ void PJSIPSessionModule::enqueueSessionWork(const SuspendableWorkPtr& work, pjsi
}
PJSIPSessionModuleThreadPoolListener::PJSIPSessionModuleThreadPoolListener()
- : mActiveThreads(0), mPjLibHook(new AsteriskSCF::PJLib::ThreadHook("SIP Session Module Pool")) { }
+ : mActiveThreads(0), mPJLIBHook(new AsteriskSCF::PJLIB::ThreadHook("SIP Session Module Pool")) { }
void PJSIPSessionModuleThreadPoolListener::stateChanged(const PoolPtr& pool, Ice::Long active, Ice::Long idle, Ice::Long)
{
@@ -2110,13 +2110,13 @@ void PJSIPSessionModuleThreadPoolListener::queueEmptied(const PoolPtr& pool)
void PJSIPSessionModuleThreadPoolListener::threadStart()
{
lg(Debug) << "New thread created. Registering it with PJLIB";
- mPjLibHook->start();
+ mPJLIBHook->start();
}
void PJSIPSessionModuleThreadPoolListener::threadStop()
{
lg(Debug) << "Thread has completed. Unregistering it from PJLIB";
- mPjLibHook->stop();
+ mPJLIBHook->stop();
}
class SIPSessionSuspendableWorkListener : public SuspendableWorkListener
diff --git a/src/PJSIPSessionModule.h b/src/PJSIPSessionModule.h
index 6af6249..7a6cbec 100644
--- a/src/PJSIPSessionModule.h
+++ b/src/PJSIPSessionModule.h
@@ -26,7 +26,7 @@
#include <AsteriskSCF/Discovery/SmartProxy.h>
#include <AsteriskSCF/System/ThreadPool/ThreadPoolIf.h>
#include <AsteriskSCF/System/WorkQueue/WorkQueueIf.h>
-#include <AsteriskSCF/PJLib/ThreadHook.h>
+#include <AsteriskSCF/PJLIB/ThreadHook.h>
#include "SIPEndpointFactory.h"
#include "SIPReplicationContext.h"
@@ -76,7 +76,7 @@ public:
void threadStop();
private:
Ice::Long mActiveThreads;
- AsteriskSCF::PJLib::ThreadHook *mPjLibHook;
+ AsteriskSCF::PJLIB::ThreadHook *mPJLIBHook;
};
typedef IceUtil::Handle<PJSIPSessionModuleThreadPoolListener> PJSIPSessionModuleThreadPoolListenerPtr;
commit 25975e396af5734953cd1b13476f439872113a3b
Author: Mark Michelson <mmichelson at digium.com>
Date: Wed Dec 28 17:05:13 2011 -0600
Change "PJSip" to "PJSIP" and "Sip" to "SIP" in filenames and source code.
diff --git a/slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice b/slice/AsteriskSCF/Configuration/SIPSessionManager/SIPConfigurationIf.ice
similarity index 78%
rename from slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice
rename to slice/AsteriskSCF/Configuration/SIPSessionManager/SIPConfigurationIf.ice
index 49f0d96..78e0700 100644
--- a/slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice
+++ b/slice/AsteriskSCF/Configuration/SIPSessionManager/SIPConfigurationIf.ice
@@ -27,7 +27,7 @@ module AsteriskSCF
module Configuration
{
-module SipSessionManager
+module SIPSessionManager
{
["suppress"]
@@ -37,47 +37,47 @@ module V1
/**
* Service locator category for finding the configuration service
*/
-const string ConfigurationDiscoveryCategory = "SipConfiguration";
+const string ConfigurationDiscoveryCategory = "SIPConfiguration";
/**
* Local visitor class for visiting SIP configuration groups
*/
-local class SipConfigurationGroupVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationGroupVisitor
+local class SIPConfigurationGroupVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationGroupVisitor
{
};
/**
* Generic SIP configuration group
*/
-["visitor:SipConfigurationGroupVisitor"] class SipConfigurationGroup extends AsteriskSCF::System::Configuration::V1::ConfigurationGroup
+["visitor:SIPConfigurationGroupVisitor"] class SIPConfigurationGroup extends AsteriskSCF::System::Configuration::V1::ConfigurationGroup
{
};
/**
* General SIP configuration group that contains general items related to the SIP component as a whole
*/
-class SipGeneralGroup extends SipConfigurationGroup
+class SIPGeneralGroup extends SIPConfigurationGroup
{
};
/**
* Local visitor class for visiting SIP configuration items
*/
-local class SipConfigurationItemVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationItemVisitor
+local class SIPConfigurationItemVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationItemVisitor
{
};
/**
* Generic SIP configuration item
*/
-["visitor:SipConfigurationItemVisitor"] class SipConfigurationItem extends AsteriskSCF::System::Configuration::V1::ConfigurationItem
+["visitor:SIPConfigurationItemVisitor"] class SIPConfigurationItem extends AsteriskSCF::System::Configuration::V1::ConfigurationItem
{
};
/**
* SIP Endpoint group, used to configure an endpoint
*/
-class SipEndpointGroup extends SipConfigurationGroup
+class SIPEndpointGroup extends SIPConfigurationGroup
{
/**
* Name of the endpoint being configured
@@ -88,7 +88,7 @@ class SipEndpointGroup extends SipConfigurationGroup
/**
* SIP Domain group, used to configure a specific domain
*/
-class SipDomainGroup extends SipConfigurationGroup
+class SIPDomainGroup extends SIPConfigurationGroup
{
/**
* Name of the domain being configured
@@ -100,7 +100,7 @@ class SipDomainGroup extends SipConfigurationGroup
* SIP Client Registration group. Used to configure
* parameters relating to client registration
*/
-class SipRegistrationGroup extends SipConfigurationGroup
+class SIPRegistrationGroup extends SIPConfigurationGroup
{
/**
* Name for this registration group
@@ -111,7 +111,7 @@ class SipRegistrationGroup extends SipConfigurationGroup
/**
* Domain item for bindings
*/
-class SipBindingsItem extends SipConfigurationItem
+class SIPBindingsItem extends SIPConfigurationItem
{
/**
* Addresses the domain is reachable over
@@ -123,7 +123,7 @@ class SipBindingsItem extends SipConfigurationItem
* Generic SIP transport group that others derive from, primarily created since each one has
* the requirement of a name
*/
-class SipTransportGroup extends SipConfigurationGroup
+class SIPTransportGroup extends SIPConfigurationGroup
{
/**
* Name of the specific transport. Since each one may have multiple transports this differentiates
@@ -135,7 +135,7 @@ class SipTransportGroup extends SipConfigurationGroup
/**
* Host information configuration item
*/
-class SipHostItem extends SipConfigurationItem
+class SIPHostItem extends SIPConfigurationItem
{
/**
* String containing the IP address or string address
@@ -151,21 +151,21 @@ class SipHostItem extends SipConfigurationItem
/**
* Source transport address configuration item
*/
-class SipSourceTransportAddressItem extends SipHostItem
+class SIPSourceTransportAddressItem extends SIPHostItem
{
};
/**
* Target destination address configuration item
*/
-class SipTargetDestinationAddressItem extends SipHostItem
+class SIPTargetDestinationAddressItem extends SIPHostItem
{
};
/**
* Crypto certificate configuration item
*/
-class SipCryptoCertificateItem extends SipConfigurationItem
+class SIPCryptoCertificateItem extends SIPConfigurationItem
{
/**
* Full location of certificate authority file
@@ -191,7 +191,7 @@ class SipCryptoCertificateItem extends SipConfigurationItem
/**
* Crypto requirement configuration item
*/
-class SipCryptoRequirementsItem extends SipConfigurationItem
+class SIPCryptoRequirementsItem extends SIPConfigurationItem
{
/**
* Require verification of server certificate
@@ -224,7 +224,7 @@ enum TLSProtocolMethod
/**
* General crypto configuration item
*/
-class SipCryptoItem extends SipConfigurationItem
+class SIPCryptoItem extends SIPConfigurationItem
{
/**
* TLS protocol method to use
@@ -268,7 +268,7 @@ sequence<SRTPCryptoKey> SRTPCryptoKeySeq;
/**
* Direct media configuration item
*/
-class DirectMediaItem extends SipConfigurationItem
+class DirectMediaItem extends SIPConfigurationItem
{
/**
* Whether direct media support is enabled or not
@@ -279,7 +279,7 @@ class DirectMediaItem extends SipConfigurationItem
/**
* SRTP crypto configuration.
*/
-class SRTPCryptoItem extends SipConfigurationItem
+class SRTPCryptoItem extends SIPConfigurationItem
{
/**
@@ -294,13 +294,13 @@ class SRTPCryptoItem extends SipConfigurationItem
SRTPCryptoKeySeq cryptoKeys;
};
-class IdentityItem extends SipConfigurationItem
+class IdentityItem extends SIPConfigurationItem
{
string name;
string number;
};
-class IdentityGroup extends SipConfigurationGroup
+class IdentityGroup extends SIPConfigurationGroup
{
/**
* Identifier for this IdentityGroup. IdentityGroup
@@ -310,7 +310,7 @@ class IdentityGroup extends SipConfigurationGroup
string name;
};
-class IdentityGroupRef extends SipConfigurationItem
+class IdentityGroupRef extends SIPConfigurationItem
{
/**
* Name of an identity group.
@@ -321,7 +321,7 @@ class IdentityGroupRef extends SipConfigurationItem
/**
* Routing service configuration item
*/
-class SipRoutingItem extends SipConfigurationItem
+class SIPRoutingItem extends SIPConfigurationItem
{
/**
* Name of the routing service to use
@@ -332,7 +332,7 @@ class SipRoutingItem extends SipConfigurationItem
/**
* RTP Media service configuration item
*/
-class SipRTPMediaServiceItem extends SipConfigurationItem
+class SIPRTPMediaServiceItem extends SIPConfigurationItem
{
/**
* Name of the RTP media service to use
@@ -348,7 +348,7 @@ class SipRTPMediaServiceItem extends SipConfigurationItem
/**
* UDPTL Media service configuration item
*/
-class SipUDPTLMediaServiceItem extends SipConfigurationItem
+class SIPUDPTLMediaServiceItem extends SIPConfigurationItem
{
/**
* Name of the UDPTL media service to use
@@ -374,7 +374,7 @@ class SipUDPTLMediaServiceItem extends SipConfigurationItem
/**
* Signaling NAT configuration item
*/
-class SipSignalingNATItem extends SipConfigurationItem
+class SIPSignalingNATItem extends SIPConfigurationItem
{
/**
* Boolean for whether STUN is enabled
@@ -383,9 +383,9 @@ class SipSignalingNATItem extends SipConfigurationItem
};
/**
- * STUN server to be used by Sip signalling.
+ * STUN server to be used by SIP signalling.
*/
-class SipSignalingSTUNHostItem extends SipConfigurationItem
+class SIPSignalingSTUNHostItem extends SIPConfigurationItem
{
/**
* Address for the STUN server.
@@ -401,7 +401,7 @@ class SipSignalingSTUNHostItem extends SipConfigurationItem
/**
* Media NAT configuration item
*/
-class SipMediaNATItem extends SipConfigurationItem
+class SIPMediaNATItem extends SIPConfigurationItem
{
/**
* Boolean for whether ICE is enabled
@@ -417,7 +417,7 @@ class SipMediaNATItem extends SipConfigurationItem
/**
* Access control lists item
*/
-class SipACLItem extends SipConfigurationItem
+class SIPACLItem extends SIPConfigurationItem
{
/**
* Name of this ACL item. A user may want to have multiple.
@@ -448,7 +448,7 @@ class SipACLItem extends SipConfigurationItem
/**
* Allowable call directions
*/
-enum SipAllowableCallDirection
+enum SIPAllowableCallDirection
{
Disabled,
Inbound,
@@ -459,18 +459,18 @@ enum SipAllowableCallDirection
/**
* Allowable call direction item
*/
-class SipAllowableCallDirectionItem extends SipConfigurationItem
+class SIPAllowableCallDirectionItem extends SIPConfigurationItem
{
/**
* What direction is permitted for this endpoint
*/
- SipAllowableCallDirection callDirection = Both;
+ SIPAllowableCallDirection callDirection = Both;
};
/**
* Allowable media format item
*/
-class SipMediaFormatItem extends SipConfigurationItem
+class SIPMediaFormatItem extends SIPConfigurationItem
{
/**
* Name of the media format
@@ -500,7 +500,7 @@ class SipMediaFormatItem extends SipConfigurationItem
/**
* User agent presentation configuration item
*/
-class SipUserAgentItem extends SipConfigurationItem
+class SIPUserAgentItem extends SIPConfigurationItem
{
/**
* String that our user agent should appear as
@@ -511,46 +511,46 @@ class SipUserAgentItem extends SipConfigurationItem
/**
* Transport information configuration item
*/
-class SipEndpointTransportItem extends SipConfigurationItem
+class SIPEndpointTransportItem extends SIPConfigurationItem
{
/**
* What directions to require secure transport in
*/
- SipAllowableCallDirection secureTransport = Disabled;
+ SIPAllowableCallDirection secureTransport = Disabled;
};
/**
* Group of configuration items related to a UDP transport
*/
-class SipUDPTransportGroup extends SipTransportGroup
+class SIPUDPTransportGroup extends SIPTransportGroup
{
};
/**
* Group of configuration items related to a TCP transport
*/
-class SipTCPTransportGroup extends SipTransportGroup
+class SIPTCPTransportGroup extends SIPTransportGroup
{
};
/**
* Group of configuration items related to a TLS transport
*/
-class SipTLSTransportGroup extends SipTransportGroup
+class SIPTLSTransportGroup extends SIPTransportGroup
{
};
/**
* Group of configuration items related to a STUN enabled transport
*/
-class SipSTUNTransportGroup extends SipTransportGroup
+class SIPSTUNTransportGroup extends SIPTransportGroup
{
};
/**
* Methods of transporting DTMF via SIP
*/
-enum SipDTMFOption
+enum SIPDTMFOption
{
Inband,
RFC4733,
@@ -560,9 +560,9 @@ enum SipDTMFOption
/**
* Denotes the method by which we will send DTMF to an endpoint
*/
-class SipDTMFItem extends SipConfigurationItem
+class SIPDTMFItem extends SIPConfigurationItem
{
- SipDTMFOption dtmf = RFC4733;
+ SIPDTMFOption dtmf = RFC4733;
};
/**
@@ -593,7 +593,7 @@ sequence<ContactInfo> ContactInfoSeq;
const int DefaultRegistrationExpirationSeconds = 3600;
-class SipClientRegistrationItem extends SipConfigurationItem
+class SIPClientRegistrationItem extends SIPConfigurationItem
{
/**
* The AOR to which the contacts will
@@ -612,16 +612,16 @@ class SipClientRegistrationItem extends SipConfigurationItem
int defaultExpiration;
};
-sequence<SipClientRegistrationItem> SipClientRegistrationItemSeq;
+sequence<SIPClientRegistrationItem> SIPClientRegistrationItemSeq;
-class SipRegistrationGroupRef extends SipConfigurationItem
+class SIPRegistrationGroupRef extends SIPConfigurationItem
{
string registrationGroupName;
};
}; /* module V1 */
-}; /* module SipSessionManager */
+}; /* module SIPSessionManager */
}; /* module Configuration */
diff --git a/slice/AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice b/slice/AsteriskSCF/Replication/SIPSessionManager/SIPStateReplicationIf.ice
similarity index 81%
rename from slice/AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice
rename to slice/AsteriskSCF/Replication/SIPSessionManager/SIPStateReplicationIf.ice
index 4e3467d..5b29ff3 100644
--- a/slice/AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/SIPSessionManager/SIPStateReplicationIf.ice
@@ -31,41 +31,41 @@ module AsteriskSCF
module Replication
{
-module SipSessionManager
+module SIPSessionManager
{
["suppress"]
module V1
{
- const string StateReplicatorComponentCategory = "SipStateReplicatorComponent";
- const string StateReplicatorDiscoveryCategory = "SipStateReplicator";
+ const string StateReplicatorComponentCategory = "SIPStateReplicatorComponent";
+ const string StateReplicatorDiscoveryCategory = "SIPStateReplicator";
- class SipStateItem
+ class SIPStateItem
{
string key;
string sessionId;
};
- sequence<SipStateItem> SipStateItemSeq;
+ sequence<SIPStateItem> SIPStateItemSeq;
- interface SipStateReplicatorListener
+ interface SIPStateReplicatorListener
{
void stateRemoved(Ice::StringSeq itemKeys);
- void stateRemovedForItems(SipStateItemSeq items);
- void stateSet(SipStateItemSeq items);
+ void stateRemovedForItems(SIPStateItemSeq items);
+ void stateSet(SIPStateItemSeq items);
};
- interface SipStateReplicator
+ interface SIPStateReplicator
{
- void addListener(SipStateReplicatorListener *listener);
- void removeListener(SipStateReplicatorListener *listener);
- void setState (SipStateItemSeq items);
+ void addListener(SIPStateReplicatorListener *listener);
+ void removeListener(SIPStateReplicatorListener *listener);
+ void setState (SIPStateItemSeq items);
void removeState(Ice::StringSeq items);
- void removeStateForItems(SipStateItemSeq items);
- idempotent SipStateItemSeq getState(Ice::StringSeq iteKeys);
- idempotent SipStateItemSeq getAllState();
+ void removeStateForItems(SIPStateItemSeq items);
+ idempotent SIPStateItemSeq getState(Ice::StringSeq iteKeys);
+ idempotent SIPStateItemSeq getAllState();
};
- class SipDialogStateItem extends SipStateItem
+ class SIPDialogStateItem extends SIPStateItem
{
string callId;
bool isDialogEstablished;
@@ -94,7 +94,7 @@ module V1
InviteSessionStateDisconnected
};
- class SipInviteSessionStateItem extends SipStateItem
+ class SIPInviteSessionStateItem extends SIPStateItem
{
InviteSessionState currentState;
bool cancelling;
@@ -128,7 +128,7 @@ module V1
TransactionStateDestroyed
};
- class SipTransactionStateItem extends SipStateItem
+ class SIPTransactionStateItem extends SIPStateItem
{
string branch;
TransactionState currentState;
@@ -143,7 +143,7 @@ module V1
dictionary<string, AsteriskSCF::Media::RTP::V1::RTPSession*> RTPMediaSessionDict;
sequence<AsteriskSCF::Media::UDPTL::V1::UDPTLSession*> UDPTLMediaSessionSeq;
- class SipSessionStateItem extends SipStateItem
+ class SIPSessionStateItem extends SIPStateItem
{
//XXX There probably needs to be a lot more specified
//here, but frankly I have no clue.
@@ -162,19 +162,19 @@ module V1
};
- class DefaultSessionListenerItem extends SipStateItem
+ class DefaultSessionListenerItem extends SIPStateItem
{
string endpointName;
AsteriskSCF::SessionCommunications::V1::SessionListener* listener;
};
- class DefaultSessionCookieItem extends SipStateItem
+ class DefaultSessionCookieItem extends SIPStateItem
{
string endpointName;
AsteriskSCF::SessionCommunications::V1::SessionCookie cookie;
};
- class SipRegistrarStateItem extends SipStateItem
+ class SIPRegistrarStateItem extends SIPStateItem
{
/**
* The bindings whose states are being set/removed
@@ -193,7 +193,7 @@ module V1
* nonexistence of this item. So we need to have enough
* information to be able to construct this item.
*/
- class TransferSessionCreationHookStateItem extends SipStateItem
+ class TransferSessionCreationHookStateItem extends SIPStateItem
{
int referCSeq;
string referredBy;
@@ -209,7 +209,7 @@ module V1
* of the item. We need enough information to be able to construct
* the item.
*/
- class TransferSessionListenerStateItem extends SipStateItem
+ class TransferSessionListenerStateItem extends SIPStateItem
{
int referCSeq;
//We need enough information to find the REFER dialog.
@@ -221,7 +221,7 @@ module V1
}; /* module V1 */
-}; /* module SipSessionManager */
+}; /* module SIPSessionManager */
}; /* module Replication */
diff --git a/slice/AsteriskSCF/SessionCookies/SipSessionManager/SipSessionCookiesIf.ice b/slice/AsteriskSCF/SessionCookies/SIPSessionManager/SIPSessionCookiesIf.ice
similarity index 95%
rename from slice/AsteriskSCF/SessionCookies/SipSessionManager/SipSessionCookiesIf.ice
rename to slice/AsteriskSCF/SessionCookies/SIPSessionManager/SIPSessionCookiesIf.ice
index e3263e6..a34f8ea 100644
--- a/slice/AsteriskSCF/SessionCookies/SipSessionManager/SipSessionCookiesIf.ice
+++ b/slice/AsteriskSCF/SessionCookies/SIPSessionManager/SIPSessionCookiesIf.ice
@@ -24,7 +24,7 @@ module AsteriskSCF
module SessionCookies
{
-module SipSessionManager
+module SIPSessionManager
{
["suppress"]
@@ -45,6 +45,6 @@ unsliceable class ReferredByCookie extends AsteriskSCF::SessionCommunications::V
};
}; //end module V1
-}; //end module SipSessionManager
+}; //end module SIPSessionManager
}; //end module SessionCookies
}; //end module AsteriskSCF
diff --git a/slice/SipIf.ice b/slice/SIPIf.ice
similarity index 89%
rename from slice/SipIf.ice
rename to slice/SIPIf.ice
index 744f6a3..617f44c 100644
--- a/slice/SipIf.ice
+++ b/slice/SIPIf.ice
@@ -26,8 +26,8 @@ module SIP
module V1
{
const string Version = "V1";
- const string ComponentServiceDiscoveryCategory = "SipSessionManager";
- const string AuthExtensionPointCategory = "SipAuthExtensionPoint";
+ const string ComponentServiceDiscoveryCategory = "SIPSessionManager";
+ const string AuthExtensionPointCategory = "SIPAuthExtensionPoint";
// A submodule for our event publication.
module Event
@@ -43,7 +43,7 @@ module V1
/**
* Interface for monitoring the SIP Session Manager events.
*/
- interface SipSessionManagerEvents
+ interface SIPSessionManagerEvents
{
/**
* Notification that a lookup was attempted on our published EndpointLocator.
diff --git a/src/AuthManager.cpp b/src/AuthManager.cpp
index edc9e5b..e36f718 100644
--- a/src/AuthManager.cpp
+++ b/src/AuthManager.cpp
@@ -25,7 +25,7 @@ using namespace AsteriskSCF::System::Logging;
namespace AsteriskSCF
{
-namespace SipSessionManager
+namespace SIPSessionManager
{
class AuthHookWrapper
diff --git a/src/AuthManager.h b/src/AuthManager.h
index da7ff3c..a07272b 100644
--- a/src/AuthManager.h
+++ b/src/AuthManager.h
@@ -27,7 +27,7 @@
namespace AsteriskSCF
{
-namespace SipSessionManager
+namespace SIPSessionManager
{
class AuthHookWrapper;
@@ -198,5 +198,5 @@ private:
typedef boost::shared_ptr<AuthManager> AuthManagerPtr;
-}; //end namespace SipSessionManager
+}; //end namespace SIPSessionManager
}; //end namespace AsteriskSCF
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 087f454..af74c6d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,99 +8,99 @@ include_directories(${logger_dir}/include)
include_directories(${astscf-ice-util-cpp_dir}/include)
#
-# Several Sip Session Gateway files seem to want this compiler flag when
+# Several SIP Session Gateway files seem to want this compiler flag when
# building for Windows x64.
#
if(${CMAKE_CL_64})
add_definitions("/bigobj")
endif()
-astscf_component_init(SipSessionManager)
-astscf_component_add_files(SipSessionManager Component.cpp)
-astscf_component_add_files(SipSessionManager SipReplicationContext.h)
-astscf_component_add_files(SipSessionManager SipSessionManagerEventPublisher.cpp)
-astscf_component_add_files(SipSessionManager SipSessionManagerEventPublisher.h)
-astscf_component_add_files(SipSessionManager SipSessionManagerEndpointLocator.cpp)
-astscf_component_add_files(SipSessionManager SipSessionManagerEndpointLocator.h)
-astscf_component_add_files(SipSessionManager SipEndpointFactory.cpp)
-astscf_component_add_files(SipSessionManager SipEndpointFactory.h)
-astscf_component_add_files(SipSessionManager SipEndpoint.cpp)
-astscf_component_add_files(SipSessionManager SipEndpoint.h)
-astscf_component_add_files(SipSessionManager SipSession.cpp)
-astscf_component_add_files(SipSessionManager SipSession.h)
-astscf_component_add_files(SipSessionManager SipTelephonyEventSource.cpp)
-astscf_component_add_files(SipSessionManager SipTelephonyEventSource.h)
-astscf_component_add_files(SipSessionManager SipTelephonyEventSink.cpp)
-astscf_component_add_files(SipSessionManager SipTelephonyEventSink.h)
-astscf_component_add_files(SipSessionManager PJSipManager.cpp)
-astscf_component_add_files(SipSessionManager PJSipManager.h)
-astscf_component_add_files(SipSessionManager PJSipModule.cpp)
-astscf_component_add_files(SipSessionManager PJSipModule.h)
-astscf_component_add_files(SipSessionManager SipTransfer.cpp)
-astscf_component_add_files(SipSessionManager SipTransfer.h)
-astscf_component_add_files(SipSessionManager PJSipSessionModule.cpp)
-astscf_component_add_files(SipSessionManager PJSipSessionModuleConstruction.cpp)
-astscf_component_add_files(SipSessionManager PJSipSessionModule.h)
-astscf_component_add_files(SipSessionManager PJSipLoggingModule.cpp)
-astscf_component_add_files(SipSessionManager PJSipLoggingModuleConstruction.cpp)
-astscf_component_add_files(SipSessionManager PJSipLoggingModule.h)
-astscf_component_add_files(SipSessionManager PJSipRegistrarModule.cpp)
-astscf_component_add_files(SipSessionManager PJSipRegistrarModuleConstruction.cpp)
-astscf_component_add_files(SipSessionManager PJSipRegistrarModule.h)
-astscf_component_add_files(SipSessionManager SipClientRegistration.cpp)
-astscf_component_add_files(SipSessionManager SipClientRegistration.h)
-astscf_component_add_files(SipSessionManager AuthManager.cpp)
-astscf_component_add_files(SipSessionManager AuthManager.h)
-astscf_component_add_files(SipSessionManager SipConfiguration.cpp)
-astscf_component_add_files(SipSessionManager SipConfiguration.h)
-astscf_component_add_files(SipSessionManager SipStateReplicatorListener.cpp)
-astscf_component_add_files(SipSessionManager SipStateReplicator.h)
-astscf_component_add_files(SipSessionManager Transports.cpp)
-astscf_component_add_files(SipSessionManager Transports.h)
-astscf_component_add_files(SipSessionManager UDPTransport.cpp)
-astscf_component_add_files(SipSessionManager UDPTransport.h)
-astscf_component_add_files(SipSessionManager TCPTransport.cpp)
-astscf_component_add_files(SipSessionManager TCPTransport.h)
-astscf_component_add_files(SipSessionManager TLSTransport.cpp)
-astscf_component_add_files(SipSessionManager TLSTransport.h)
-astscf_component_add_files(SipSessionManager PJUtil.h)
-astscf_component_add_files(SipSessionManager DebugUtil.h)
-astscf_component_add_files(SipSessionManager SipModule.h)
-astscf_component_add_files(SipSessionManager STUNModule.cpp)
-astscf_component_add_files(SipSessionManager STUNModule.h)
-astscf_component_add_files(SipSessionManager STUNTransport.cpp)
-astscf_component_add_files(SipSessionManager STUNTransport.h)
-astscf_component_add_files(SipSessionManager STUNTransportConfig.cpp)
-astscf_component_add_files(SipSessionManager STUNTransportConfig.h)
-astscf_component_add_files(SipSessionManager NATOptions.h)
-astscf_component_add_files(SipSessionManager SipRegistrarListener.cpp)
-astscf_component_add_files(SipSessionManager SipRegistrarListener.h)
-astscf_component_add_slices(SipSessionManager PROJECT SipIf.ice)
-astscf_component_add_slices(SipSessionManager PROJECT AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice)
-astscf_component_add_slices(SipSessionManager PROJECT AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice)
-astscf_component_add_slices(SipSessionManager PROJECT AsteriskSCF/SessionCookies/SipSessionManager/SipSessionCookiesIf.ice)
-astscf_component_add_ice_libraries(SipSessionManager IceStorm)
-astscf_component_add_boost_libraries(SipSessionManager core)
-astscf_component_add_slice_collection_libraries(SipSessionManager ASTSCF)
-astscf_component_build_icebox(SipSessionManager)
-target_link_libraries(SipSessionManager LoggingClient ASTSCFIceUtilCpp ASTSCFIceUtilCppPJLIB ${OPENSSL_LIBRARIES})
+astscf_component_init(SIPSessionManager)
+astscf_component_add_files(SIPSessionManager Component.cpp)
+astscf_component_add_files(SIPSessionManager SIPReplicationContext.h)
+astscf_component_add_files(SIPSessionManager SIPSessionManagerEventPublisher.cpp)
+astscf_component_add_files(SIPSessionManager SIPSessionManagerEventPublisher.h)
+astscf_component_add_files(SIPSessionManager SIPSessionManagerEndpointLocator.cpp)
+astscf_component_add_files(SIPSessionManager SIPSessionManagerEndpointLocator.h)
+astscf_component_add_files(SIPSessionManager SIPEndpointFactory.cpp)
+astscf_component_add_files(SIPSessionManager SIPEndpointFactory.h)
+astscf_component_add_files(SIPSessionManager SIPEndpoint.cpp)
+astscf_component_add_files(SIPSessionManager SIPEndpoint.h)
+astscf_component_add_files(SIPSessionManager SIPSession.cpp)
+astscf_component_add_files(SIPSessionManager SIPSession.h)
+astscf_component_add_files(SIPSessionManager SIPTelephonyEventSource.cpp)
+astscf_component_add_files(SIPSessionManager SIPTelephonyEventSource.h)
+astscf_component_add_files(SIPSessionManager SIPTelephonyEventSink.cpp)
+astscf_component_add_files(SIPSessionManager SIPTelephonyEventSink.h)
+astscf_component_add_files(SIPSessionManager PJSIPManager.cpp)
+astscf_component_add_files(SIPSessionManager PJSIPManager.h)
+astscf_component_add_files(SIPSessionManager PJSIPModule.cpp)
+astscf_component_add_files(SIPSessionManager PJSIPModule.h)
+astscf_component_add_files(SIPSessionManager SIPTransfer.cpp)
+astscf_component_add_files(SIPSessionManager SIPTransfer.h)
+astscf_component_add_files(SIPSessionManager PJSIPSessionModule.cpp)
+astscf_component_add_files(SIPSessionManager PJSIPSessionModuleConstruction.cpp)
+astscf_component_add_files(SIPSessionManager PJSIPSessionModule.h)
+astscf_component_add_files(SIPSessionManager PJSIPLoggingModule.cpp)
+astscf_component_add_files(SIPSessionManager PJSIPLoggingModuleConstruction.cpp)
+astscf_component_add_files(SIPSessionManager PJSIPLoggingModule.h)
+astscf_component_add_files(SIPSessionManager PJSIPRegistrarModule.cpp)
+astscf_component_add_files(SIPSessionManager PJSIPRegistrarModuleConstruction.cpp)
+astscf_component_add_files(SIPSessionManager PJSIPRegistrarModule.h)
+astscf_component_add_files(SIPSessionManager SIPClientRegistration.cpp)
+astscf_component_add_files(SIPSessionManager SIPClientRegistration.h)
+astscf_component_add_files(SIPSessionManager AuthManager.cpp)
+astscf_component_add_files(SIPSessionManager AuthManager.h)
+astscf_component_add_files(SIPSessionManager SIPConfiguration.cpp)
+astscf_component_add_files(SIPSessionManager SIPConfiguration.h)
+astscf_component_add_files(SIPSessionManager SIPStateReplicatorListener.cpp)
+astscf_component_add_files(SIPSessionManager SIPStateReplicator.h)
+astscf_component_add_files(SIPSessionManager Transports.cpp)
+astscf_component_add_files(SIPSessionManager Transports.h)
+astscf_component_add_files(SIPSessionManager UDPTransport.cpp)
+astscf_component_add_files(SIPSessionManager UDPTransport.h)
+astscf_component_add_files(SIPSessionManager TCPTransport.cpp)
+astscf_component_add_files(SIPSessionManager TCPTransport.h)
+astscf_component_add_files(SIPSessionManager TLSTransport.cpp)
+astscf_component_add_files(SIPSessionManager TLSTransport.h)
+astscf_component_add_files(SIPSessionManager PJUtil.h)
+astscf_component_add_files(SIPSessionManager DebugUtil.h)
+astscf_component_add_files(SIPSessionManager SIPModule.h)
+astscf_component_add_files(SIPSessionManager STUNModule.cpp)
+astscf_component_add_files(SIPSessionManager STUNModule.h)
+astscf_component_add_files(SIPSessionManager STUNTransport.cpp)
+astscf_component_add_files(SIPSessionManager STUNTransport.h)
+astscf_component_add_files(SIPSessionManager STUNTransportConfig.cpp)
+astscf_component_add_files(SIPSessionManager STUNTransportConfig.h)
+astscf_component_add_files(SIPSessionManager NATOptions.h)
+astscf_component_add_files(SIPSessionManager SIPRegistrarListener.cpp)
+astscf_component_add_files(SIPSessionManager SIPRegistrarListener.h)
+astscf_component_add_slices(SIPSessionManager PROJECT SIPIf.ice)
+astscf_component_add_slices(SIPSessionManager PROJECT AsteriskSCF/Replication/SIPSessionManager/SIPStateReplicationIf.ice)
+astscf_component_add_slices(SIPSessionManager PROJECT AsteriskSCF/Configuration/SIPSessionManager/SIPConfigurationIf.ice)
+astscf_component_add_slices(SIPSessionManager PROJECT AsteriskSCF/SessionCookies/SIPSessionManager/SIPSessionCookiesIf.ice)
+astscf_component_add_ice_libraries(SIPSessionManager IceStorm)
+astscf_component_add_boost_libraries(SIPSessionManager core)
+astscf_component_add_slice_collection_libraries(SIPSessionManager ASTSCF)
+astscf_component_build_icebox(SIPSessionManager)
+target_link_libraries(SIPSessionManager LoggingClient ASTSCFIceUtilCpp ASTSCFIceUtilCppPJLIB ${OPENSSL_LIBRARIES})
-pjproject_link(SipSessionManager pjsip)
-pjproject_link(SipSessionManager pjmedia)
-pjproject_link(SipSessionManager pjnath)
-pjproject_link(SipSessionManager pjlib-util)
-pjproject_link(SipSessionManager pjlib)
-astscf_component_install(SipSessionManager)
+pjproject_link(SIPSessionManager pjsip)
+pjproject_link(SIPSessionManager pjmedia)
+pjproject_link(SIPSessionManager pjnath)
+pjproject_link(SIPSessionManager pjlib-util)
+pjproject_link(SIPSessionManager pjlib)
+astscf_component_install(SIPSessionManager)
-astscf_component_init(SipStateReplicator)
-astscf_component_add_files(SipStateReplicator SipStateReplicatorApp.cpp)
-astscf_component_add_files(SipStateReplicator SipStateReplicator.h)
-astscf_component_add_slices(SipStateReplicator PROJECT SipIf.ice)
-astscf_component_add_slices(SipStateReplicator PROJECT AsteriskSCF/Replication/SipSessionManager/SipStateReplicationIf.ice)
-astscf_component_add_slices(SipStateReplicator PROJECT AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice)
-astscf_component_add_ice_libraries(SipStateReplicator IceStorm)
-astscf_component_add_boost_libraries(SipStateReplicator thread date_time)
-astscf_component_add_slice_collection_libraries(SipStateReplicator ASTSCF)
-astscf_component_build_icebox(SipStateReplicator)
-target_link_libraries(SipStateReplicator LoggingClient ASTSCFIceUtilCpp)
-astscf_component_install(SipStateReplicator)
+astscf_component_init(SIPStateReplicator)
+astscf_component_add_files(SIPStateReplicator SIPStateReplicatorApp.cpp)
+astscf_component_add_files(SIPStateReplicator SIPStateReplicator.h)
+astscf_component_add_slices(SIPStateReplicator PROJECT SIPIf.ice)
+astscf_component_add_slices(SIPStateReplicator PROJECT AsteriskSCF/Replication/SIPSessionManager/SIPStateReplicationIf.ice)
+astscf_component_add_slices(SIPStateReplicator PROJECT AsteriskSCF/Configuration/SIPSessionManager/SIPConfigurationIf.ice)
+astscf_component_add_ice_libraries(SIPStateReplicator IceStorm)
+astscf_component_add_boost_libraries(SIPStateReplicator thread date_time)
+astscf_component_add_slice_collection_libraries(SIPStateReplicator ASTSCF)
+astscf_component_build_icebox(SIPStateReplicator)
+target_link_libraries(SIPStateReplicator LoggingClient ASTSCFIceUtilCpp)
+astscf_component_install(SIPStateReplicator)
diff --git a/src/Component.cpp b/src/Component.cpp
index 4d26bcb..9f39666 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -35,20 +35,20 @@
#include <AsteriskSCF/PJLib/ThreadHook.h>
#include <AsteriskSCF/Replication/ReplicationContext.h>
-#include "SipSessionManagerEventPublisher.h"
-#include "SipSessionManagerEndpointLocator.h"
-#include "SipEndpointFactory.h"
-#include "PJSipSessionModule.h"
-#include "PJSipManager.h"
-#include "SipSession.h"
-#include "SipStateReplicator.h"
-#include "SipConfiguration.h"
-#include "SipRegistrarListener.h"
-#include "SipReplicationContext.h"
+#include "SIPSessionManagerEventPublisher.h"
+#include "SIPSessionManagerEndpointLocator.h"
+#include "SIPEndpointFactory.h"
+#include "PJSIPSessionModule.h"
+#include "PJSIPManager.h"
+#include "SIPSession.h"
+#include "SIPStateReplicator.h"
+#include "SIPConfiguration.h"
+#include "SIPRegistrarListener.h"
+#include "SIPReplicationContext.h"
using namespace std;
-using namespace AsteriskSCF::SipSessionManager;
-using namespace AsteriskSCF::Configuration::SipSessionManager::V1;
+using namespace AsteriskSCF::SIPSessionManager;
+using namespace AsteriskSCF::Configuration::SIPSessionManager::V1;
using namespace AsteriskSCF::Core;
using namespace AsteriskSCF::Core::Routing::V1;
using namespace AsteriskSCF::Core::Discovery::V1;
@@ -65,19 +65,19 @@ using namespace AsteriskSCF::Discovery;
namespace
{
-Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionGateway");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SIPSessionGateway");
}
namespace AsteriskSCF
{
-namespace SipSessionManager
+namespace SIPSessionManager
{
-class SipAuthExtensionPoint : public AuthExtensionPoint
+class SIPAuthExtensionPoint : public AuthExtensionPoint
{
public:
- SipAuthExtensionPoint(const PJSipManagerPtr& manager)
- : mPJSipManager(manager)
+ SIPAuthExtensionPoint(const PJSIPManagerPtr& manager)
+ : mPJSIPManager(manager)
{
}
@@ -87,23 +87,23 @@ public:
const RequestTypeSeq &requestTypes,
const Ice::Current&)
{
- mPJSipManager->addAuthHook(hook, priority, requestTypes);
+ mPJSIPManager->addAuthHook(hook, priority, requestTypes);
}
void removeAuthHook(const AuthHookPrx &hook, const Ice::Current&)
{
- mPJSipManager->removeAuthHook(hook);
+ mPJSIPManager->removeAuthHook(hook);
}
void clearAuthHooks(const Ice::Current&)
{
- mPJSipManager->clearAuthHooks();
+ mPJSIPManager->clearAuthHooks();
}
private:
- PJSipManagerPtr mPJSipManager;
+ PJSIPManagerPtr mPJSIPManager;
};
-typedef IceUtil::Handle<SipAuthExtensionPoint> SipAuthExtensionPointPtr;
+typedef IceUtil::Handle<SIPAuthExtensionPoint> SIPAuthExtensionPointPtr;
/**
* This private class initializes the startup and controls the shutdown of the component.
@@ -152,7 +152,7 @@ private:
void locateSessionRouter();
void locateStateReplicator();
- void registerPJSipModules();
+ void registerPJSIPModules();
bool mListeningToReplicator;
@@ -166,17 +166,17 @@ private:
ConfigurationServicePrx mConfigurationServiceProxy;
// State Replication listener
- SipStateReplicatorListenerPtr mReplicatorListener;
- SipStateReplicatorListenerPrx mReplicatorListenerProxy;
+ SIPStateReplicatorListenerPtr mReplicatorListener;
+ SIPStateReplicatorListenerPrx mReplicatorListenerProxy;
// Implementation support classes
- boost::shared_ptr<SipSessionManagerEventPublisher> mEventPublisher;
+ boost::shared_ptr<SIPSessionManagerEventPublisher> mEventPublisher;
Routing::V1::EndpointLocatorPtr mEndpointLocator;
- boost::shared_ptr<SipEndpointFactory> mEndpointFactory;
- PJSipManagerPtr mPJSipManager;
+ boost::shared_ptr<SIPEndpointFactory> mEndpointFactory;
+ PJSIPManagerPtr mPJSIPManager;
// Servants and their proxies
- SipAuthExtensionPointPtr mAuthExtension;
+ SIPAuthExtensionPointPtr mAuthExtension;
AuthExtensionPointPrx mAuthExtensionPrx;
LocatorRegistrationWrapperPtr mAuthExtensionRegistration;
@@ -188,17 +188,17 @@ private:
AsteriskSCF::Discovery::SmartProxy<LocatorRegistryPrx> mRoutingServiceLocatorRegistry;
};
-static const string EndpointLocatorObjectId("SipChannelEndpointLocator");
-static const string ReplicaServiceId("SipChannelReplica");
-static const string AuthServiceId("SipAuthExtensionPoint");
-static const string RegistrarListenerId("SipRegistrarListener");
+static const string EndpointLocatorObjectId("SIPChannelEndpointLocator");
+static const string ReplicaServiceId("SIPChannelReplica");
+static const string AuthServiceId("SIPAuthExtensionPoint");
+static const string RegistrarListenerId("SIPRegistrarListener");
/**
* Override of factory method to create our custom replication context.
*/
ReplicationContextPtr Component::createReplicationContext(ReplicationStateType state)
{
- SipReplicationContextPtr context(new SipReplicationContext(state));
+ SIPReplicationContextPtr context(new SIPReplicationContext(state));
return context;
}
@@ -253,13 +253,13 @@ void Component::locateRoutingService()
ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
genericparams->category = Routing::V1::RoutingServiceLocatorRegistryDiscoveryCategory;
genericparams->service =
- getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".Sip.RoutingService", "default");
+ getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".SIP.RoutingService", "default");
AsteriskSCF::Discovery::SmartProxy<LocatorRegistryPrx> pw(getServiceLocator(), genericparams, lg);
mRoutingServiceLocatorRegistry = pw;
// This exists here since it may need to be known before actually contacting the routing service
- mRoutingId = getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".Sip.RoutingDestinationId", "pjsip");
+ mRoutingId = getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".SIP.RoutingDestinationId", "pjsip");
}
void Component::locateStateReplicator()
@@ -272,13 +272,13 @@ void Component::locateStateReplicator()
ServiceLocatorParamsPtr replicatorParams = new ServiceLocatorParams();
replicatorParams->category = StateReplicatorDiscoveryCategory;
replicatorParams->service =
- getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".Sip.StateReplicatorService", "default");
+ getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".SIP.StateReplicatorService", "default");
try
{
- AsteriskSCF::Discovery::SmartProxy<SipStateReplicatorPrx> pw(getServiceLocator(), replicatorParams, lg);
- SipReplicationContextPtr sipReplicationContext =
- boost::static_pointer_cast<SipReplicationContext>(getReplicationContext());
+ AsteriskSCF::Discovery::SmartProxy<SIPStateReplicatorPrx> pw(getServiceLocator(), replicatorParams, lg);
+ SIPReplicationContextPtr sipReplicationContext =
+ boost::static_pointer_cast<SIPReplicationContext>(getReplicationContext());
sipReplicationContext->setReplicator(pw);
@@ -296,8 +296,8 @@ void Component::locateStateReplicator()
void Component::listenToStateReplicators()
{
- SipReplicationContextPtr sipReplicationContext =
- boost::static_pointer_cast<SipReplicationContext>(getReplicationContext());
+ SIPReplicationContextPtr sipReplicationContext =
+ boost::static_pointer_cast<SIPReplicationContext>(getReplicationContext());
if (mListeningToReplicator == true)
{
@@ -334,8 +334,8 @@ void Component::listenToStateReplicators()
*/
void Component::stopListeningToStateReplicators()
{
- SipReplicationContextPtr sipReplicationContext =
- boost::static_pointer_cast<SipReplicationContext>(getReplicationContext());
+ SIPReplicationContextPtr sipReplicationContext =
+ boost::static_pointer_cast<SIPReplicationContext>(getReplicationContext());
if ((!sipReplicationContext->getReplicator().isInitialized()) || (mListeningToReplicator == false))
{
@@ -369,13 +369,13 @@ void Component::locateSessionRouter()
mSessionRouter = pw;
}
-void Component::registerPJSipModules()
+void Component::registerPJSIPModules()
{
- SipReplicationContextPtr sipReplicationContext =
- boost::static_pointer_cast<SipReplicationContext>(getReplicationContext());
+ SIPReplicationContextPtr sipReplicationContext =
+ boost::static_pointer_cast<SIPReplicationContext>(getReplicationContext());
Ice::PropertiesPtr props = getCommunicator()->getProperties();
- Ice::StringSeq moduleNames = props->getPropertyAsList(getName() + ".Sip.Modules");
+ Ice::StringSeq moduleNames = props->getPropertyAsList(getName() + ".SIP.Modules");
for (Ice::StringSeq::iterator i = moduleNames.begin();
i != moduleNames.end();
++i)
@@ -386,7 +386,7 @@ void Component::registerPJSipModules()
//we'll just do it here instead.
if ((*i) == "Session")
{
- mPJSipManager->registerSessionModule(mEndpointFactory,
+ mPJSIPManager->registerSessionModule(mEndpointFactory,
mSessionRouter,
getServiceLocator(),
sipReplicationContext,
@@ -395,11 +395,11 @@ void Component::registerPJSipModules()
}
else if ((*i) == "Logging" || (*i) == "Logger")
{
- mPJSipManager->registerLoggingModule();
+ mPJSIPManager->registerLoggingModule();
}
else if (*i == "Registrar")
{
- mPJSipManager->registerRegistrarModule(mDefaultRegistrarListenerPrx,
+ mPJSIPManager->registerRegistrarModule(mDefaultRegistrarListenerPrx,
sipReplicationContext,
getServiceAdapter());
}
@@ -424,15 +424,15 @@ void Component::onPreInitialize()
id.properties = getCommunicator()->getProperties();
// Initialize PJSIP
- // NOTE: Should use PJSipManager::create now.
- mPJSipManager = PJSipManager::create(getName(), getCommunicator()->getProperties());
+ // NOTE: Should use PJSIPManager::create now.
+ mPJSIPManager = PJSIPManager::create(getName(), getCommunicator()->getProperties());
lg(Debug) << "Created PJSIP manager";
setCommunicator(Ice::initialize(id));
}
catch(const std::exception& e)
{
- lg(Critical) << "Communicator or PJSipManager failure in " << getName() << " initialization: " << e.what();
+ lg(Critical) << "Communicator or PJSIPManager failure in " << getName() << " initialization: " << e.what();
}
}
@@ -505,7 +505,7 @@ void Component::onPostInitialize()
{
try
{
- registerPJSipModules();
+ registerPJSIPModules();
}
catch(const std::exception& e)
{
@@ -521,16 +521,16 @@ void Component::createPrimaryServices()
{
try
{
- SipReplicationContextPtr sipReplicationContext =
- boost::static_pointer_cast<SipReplicationContext>(getReplicationContext());
+ SIPReplicationContextPtr sipReplicationContext =
+ boost::static_pointer_cast<SIPReplicationContext>(getReplicationContext());
- mEventPublisher.reset(new SipSessionManagerEventPublisher(getServiceAdapter()));
+ mEventPublisher.reset(new SIPSessionManagerEventPublisher(getServiceAdapter()));
lg(Debug) << "Created SIP Session Manager event publisher";
- mEndpointFactory.reset(new SipEndpointFactory(
+ mEndpointFactory.reset(new SIPEndpointFactory(
getServiceAdapter(),
getBackplaneAdapter(),
- mPJSipManager,
+ mPJSIPManager,
getServiceLocator(),
sipReplicationContext));
lg(Debug) << "Created SIP endpoint factory";
@@ -542,18 +542,18 @@ void Component::createPrimaryServices()
locateRoutingService();
// Create and configure our Endpoint Locator.
- mEndpointLocator = new SipSessionManagerEndpointLocator(mEndpointFactory);
+ mEndpointLocator = new SIPSessionManagerEndpointLocator(mEndpointFactory);
getServiceAdapter()->add(mEndpointLocator, getCommunicator()->stringToIdentity(EndpointLocatorObjectId));
lg(Debug) << "Got proxy to endpoint locator";
// Create our RegistrarListener
- mDefaultRegistrarListener = new SipDefaultRegistrarListener(mEndpointFactory);
+ mDefaultRegistrarListener = new SIPDefaultRegistrarListener(mEndpointFactory);
mDefaultRegistrarListenerPrx = RegistrarListenerPrx::uncheckedCast(
getServiceAdapter()->add(mDefaultRegistrarListener, getCommunicator()->stringToIdentity(RegistrarListenerId)));
lg(Debug) << "Added default registrar listener to object adapter";
- // Create our SipAuthExtensionPoint servant.
- mAuthExtension = new SipAuthExtensionPoint(mPJSipManager);
+ // Create our SIPAuthExtensionPoint servant.
+ mAuthExtension = new SIPAuthExtensionPoint(mPJSIPManager);
mAuthExtensionPrx = AuthExtensionPointPrx::uncheckedCast(
getServiceAdapter()->add(mAuthExtension, getCommunicator()->stringToIdentity(AuthServiceId)));
lg(Debug) << "Added Authentication extension point to object adapter";
@@ -572,7 +572,7 @@ void Component::createBackplaneServices()
try
{
// Create and publish our Configuration interface support.
- mConfigurationService = createConfigurationServant(mPJSipManager, mEndpointFactory, mRoutingId, mRoutingServiceLocatorRegistry);
+ mConfigurationService = createConfigurationServant(mPJSIPManager, mEndpointFactory, mRoutingId, mRoutingServiceLocatorRegistry);
mConfigurationServiceProxy = ConfigurationServicePrx::uncheckedCast(
getBackplaneAdapter()->addWithUUID(mConfigurationService));
lg(Debug) << "Created SIP Configuration Implementation";
@@ -593,14 +593,14 @@ void Component::createReplicationStateListeners()
try
{
// Create and publish our state replicator listener interface.
- mReplicatorListener = new SipStateReplicatorListenerI(mEndpointFactory,
- mPJSipManager,
+ mReplicatorListener = new SIPStateReplicatorListenerI(mEndpointFactory,
+ mPJSIPManager,
getServiceAdapter(),
- boost::static_pointer_cast<SipReplicationContext>(getReplicationContext()));
+ boost::static_pointer_cast<SIPReplicationContext>(getReplicationContext()));
- SipStateReplicatorListenerPrx replicatorListener = SipStateReplicatorListenerPrx::uncheckedCast(
+ SIPStateReplicatorListenerPrx replicatorListener = SIPStateReplicatorListenerPrx::uncheckedCast(
getBackplaneAdapter()->addWithUUID(mReplicatorListener));
- mReplicatorListenerProxy = SipStateReplicatorListenerPrx::uncheckedCast(replicatorListener->ice_oneway());
+ mReplicatorListenerProxy = SIPStateReplicatorListenerPrx::uncheckedCast(replicatorListener->ice_oneway());
lg(Debug) << "Got proxy to SIP state replicator";
}
@@ -633,9 +633,9 @@ extern "C"
{
ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
- return new AsteriskSCF::SipSessionManager::Component;
+ return new AsteriskSCF::SIPSessionManager::Component;
}
}
-}; // end SipSessionManager
+}; // end SIPSessionManager
}; // end AsteriskSCF
diff --git a/src/NATOptions.h b/src/NATOptions.h
index 5c71700..58f6e6a 100644
--- a/src/NATOptions.h
+++ b/src/NATOptions.h
@@ -20,7 +20,7 @@
namespace AsteriskSCF
{
-namespace SipSessionManager
+namespace SIPSessionManager
{
struct NATEndpointOptions
{
@@ -35,5 +35,5 @@ struct NATEndpointOptions
{
}
};
-} /* End of namespace SipSessionManager */
+} /* End of namespace SIPSessionManager */
} /* End of namespace AsteriskSCF */
diff --git a/src/PJSipDummyModule.h b/src/PJSIPDummyModule.h
similarity index 82%
rename from src/PJSipDummyModule.h
rename to src/PJSIPDummyModule.h
index 02b64fe..a026074 100644
--- a/src/PJSipDummyModule.h
+++ b/src/PJSIPDummyModule.h
@@ -8,7 +8,7 @@
#pragma once
-#include "PJSipModule.h"
+#include "PJSIPModule.h"
/**
* This header is intended to be used as a basis
* for writing PJSIP modules in Asterisk SCF.
@@ -17,13 +17,13 @@
namespace AsteriskSCF
{
-namespace SipChannelService
+namespace SIPChannelService
{
-class PJSipDummyModule : public PJSipModule
+class PJSIPDummyModule : public PJSIPModule
{
public:
- PJSipDummyModule(pjsip_endpoint *endpt);
+ PJSIPDummyModule(pjsip_endpoint *endpt);
pj_status_t load(pjsip_endpoint *endpoint);
pj_status_t start();
pj_status_t stop();
diff --git a/src/PJSipDummyModuleConstruction.cpp b/src/PJSIPDummyModuleConstruction.cpp
similarity index 93%
rename from src/PJSipDummyModuleConstruction.cpp
rename to src/PJSIPDummyModuleConstruction.cpp
index 623b3bf..936304b 100644
--- a/src/PJSipDummyModuleConstruction.cpp
+++ b/src/PJSIPDummyModuleConstruction.cpp
@@ -6,12 +6,12 @@
* All rights reserved.
*/
-#include "PJSipDummyModule.h"
+#include "PJSIPDummyModule.h"
namespace AsteriskSCF
{
-namespace SipChannelService
+namespace SIPChannelService
{
/**
@@ -25,7 +25,7 @@ namespace SipChannelService
* see the PJSIP developer's guide.
*/
-static PJSipDummyModule *dummyModule;
+static PJSIPDummyModule *dummyModule;
static pj_status_t dummyLoad(pjsip_endpoint *endpoint)
{
@@ -72,7 +72,7 @@ static void dummyOnTsxState(pjsip_transaction *tsx, pjsip_event *event)
return dummyModule->on_tsx_state(tsx, event);
}
-PJSipDummyModule::PJSipDummyModule(pjsip_endpoint *endpt)
+PJSIPDummyModule::PJSIPDummyModule(pjsip_endpoint *endpt)
{
dummyModule = this;
char name[] = "Dummy Module";
diff --git a/src/PJSipLoggingModule.cpp b/src/PJSIPLoggingModule.cpp
similarity index 69%
rename from src/PJSipLoggingModule.cpp
rename to src/PJSIPLoggingModule.cpp
index ef576ff..1397204 100644
--- a/src/PJSipLoggingModule.cpp
+++ b/src/PJSIPLoggingModule.cpp
@@ -14,7 +14,7 @@
* at the top of the source tree.
*/
-#include "PJSipLoggingModule.h"
+#include "PJSIPLoggingModule.h"
#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Logger.h>
@@ -23,64 +23,64 @@ using namespace AsteriskSCF::System::Logging;
namespace
{
-Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionGateway");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SIPSessionGateway");
}
namespace AsteriskSCF
{
-namespace SipSessionManager
+namespace SIPSessionManager
{
-pj_status_t PJSipLoggingModule::load(pjsip_endpoint*)
+pj_status_t PJSIPLoggingModule::load(pjsip_endpoint*)
{
return PJ_SUCCESS;
}
-pj_status_t PJSipLoggingModule::start()
+pj_status_t PJSIPLoggingModule::start()
{
return PJ_SUCCESS;
}
-pj_status_t PJSipLoggingModule::stop()
+pj_status_t PJSIPLoggingModule::stop()
{
return PJ_SUCCESS;
}
-pj_status_t PJSipLoggingModule::unload()
+pj_status_t PJSIPLoggingModule::unload()
{
return PJ_SUCCESS;
}
-pj_bool_t PJSipLoggingModule::on_rx_request(pjsip_rx_data *rdata)
+pj_bool_t PJSIPLoggingModule::on_rx_request(pjsip_rx_data *rdata)
{
lg(Trace) << "Incoming SIP request" << std::endl;
lg(Trace) << rdata->pkt_info.packet << std::endl;
return PJ_FALSE;
}
-pj_bool_t PJSipLoggingModule::on_rx_response(pjsip_rx_data *rdata)
+pj_bool_t PJSIPLoggingModule::on_rx_response(pjsip_rx_data *rdata)
{
lg(Trace) << "Incoming SIP response" << std::endl;
lg(Trace) << rdata->pkt_info.packet << std::endl;
return PJ_FALSE;
}
-pj_status_t PJSipLoggingModule::on_tx_request(pjsip_tx_data *tdata)
+pj_status_t PJSIPLoggingModule::on_tx_request(pjsip_tx_data *tdata)
{
lg(Trace) << "Outgoing SIP request" << std::endl;
lg(Trace) << tdata->buf.start << std::endl;
return PJ_SUCCESS;
}
-pj_status_t PJSipLoggingModule::on_tx_response(pjsip_tx_data *tdata)
+pj_status_t PJSIPLoggingModule::on_tx_response(pjsip_tx_data *tdata)
{
lg(Trace) << "Outgoing SIP response" << std::endl;
lg(Trace) << tdata->buf.start << std::endl;
return PJ_SUCCESS;
}
-void PJSipLoggingModule::on_tsx_state(pjsip_transaction*, pjsip_event*)
+void PJSIPLoggingModule::on_tsx_state(pjsip_transaction*, pjsip_event*)
{
}
diff --git a/src/PJSipLoggingModule.h b/src/PJSIPLoggingModule.h
similarity index 82%
rename from src/PJSipLoggingModule.h
rename to src/PJSIPLoggingModule.h
index 94e93e2..e0d49fa 100644
--- a/src/PJSipLoggingModule.h
+++ b/src/PJSIPLoggingModule.h
@@ -16,18 +16,18 @@
#pragma once
-#include "PJSipModule.h"
+#include "PJSIPModule.h"
namespace AsteriskSCF
{
-namespace SipSessionManager
+namespace SIPSessionManager
{
-class PJSipLoggingModule : public PJSipModule
+class PJSIPLoggingModule : public PJSIPModule
{
public:
- PJSipLoggingModule(pjsip_endpoint *endpt);
+ PJSIPLoggingModule(pjsip_endpoint *endpt);
pj_status_t load(pjsip_endpoint *endpoint);
pj_status_t start();
pj_status_t stop();
@@ -39,7 +39,7 @@ public:
void on_tsx_state(pjsip_transaction *tsx, pjsip_event *event);
};
-typedef IceUtil::Handle<PJSipLoggingModule> PJSipLoggingModulePtr;
+typedef IceUtil::Handle<PJSIPLoggingModule> PJSIPLoggingModulePtr;
};
};
diff --git a/src/PJSipLoggingModuleConstruction.cpp b/src/PJSIPLoggingModuleConstruction.cpp
similarity index 93%
rename from src/PJSipLoggingModuleConstruction.cpp
rename to src/PJSIPLoggingModuleConstruction.cpp
index 99960a3..f5d809a 100644
--- a/src/PJSipLoggingModuleConstruction.cpp
+++ b/src/PJSIPLoggingModuleConstruction.cpp
@@ -14,15 +14,15 @@
* at the top of the source tree.
*/
-#include "PJSipLoggingModule.h"
+#include "PJSIPLoggingModule.h"
namespace AsteriskSCF
{
-namespace SipSessionManager
+namespace SIPSessionManager
{
-static PJSipLoggingModule *loggingModule;
+static PJSIPLoggingModule *loggingModule;
static pj_status_t loggingLoad(pjsip_endpoint *endpoint)
{
@@ -69,7 +69,7 @@ static void loggingOnTsxState(pjsip_transaction *tsx, pjsip_event *event)
return loggingModule->on_tsx_state(tsx, event);
}
-PJSipLoggingModule::PJSipLoggingModule(pjsip_endpoint *endpt)
+PJSIPLoggingModule::PJSIPLoggingModule(pjsip_endpoint *endpt)
{
loggingModule = this;
char name[] = "Logging Module";
diff --git a/src/PJSipManager.cpp b/src/PJSIPManager.cpp
similarity index 75%
rename from src/PJSipManager.cpp
rename to src/PJSIPManager.cpp
index 0a7e2fb..b8d3f45 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSIPManager.cpp
@@ -14,7 +14,7 @@
* at the top of the source tree.
*/
-#include "PJSipManager.h"
+#include "PJSIPManager.h"
#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/System/ExceptionsIf.h>
@@ -27,9 +27,9 @@
#include "PJUtil.h"
#include "STUNModule.h"
#include "UDPTransport.h"
-#include "PJSipSessionModule.h"
-#include "PJSipRegistrarModule.h"
-#include "PJSipLoggingModule.h"
+#include "PJSIPSessionModule.h"
+#include "PJSIPRegistrarModule.h"
+#include "PJSIPLoggingModule.h"
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::System::Hook::V1;
@@ -40,19 +40,19 @@ using namespace std;
namespace
{
-Logger logger = getLoggerFactory().getLogger("AsteriskSCF.SipSessionGateway");
-const std::string RegistrarId("SipRegistrar");
+Logger logger = getLoggerFactory().getLogger("AsteriskSCF.SIPSessionGateway");
+const std::string RegistrarId("SIPRegistrar");
}
namespace AsteriskSCF
{
-namespace SipSessionManager
+namespace SIPSessionManager
{
using namespace AsteriskSCF::SIP::Registration::V1;
-void PJSipManager::addAuthHook(const AuthHookPrx &hook, int priority, const RequestTypeSeq &types)
+void PJSIPManager::addAuthHook(const AuthHookPrx &hook, int priority, const RequestTypeSeq &types)
{
if (mSessionModule)
{
@@ -64,7 +64,7 @@ void PJSipManager::addAuthHook(const AuthHookPrx &hook, int priority, const Requ
}
}
-void PJSipManager::removeAuthHook(const AuthHookPrx &hook)
+void PJSIPManager::removeAuthHook(const AuthHookPrx &hook)
{
if (mSessionModule)
{
@@ -76,7 +76,7 @@ void PJSipManager::removeAuthHook(const AuthHookPrx &hook)
}
}
-void PJSipManager::clearAuthHooks()
+void PJSIPManager::clearAuthHooks()
{
if (mSessionModule)
{
@@ -90,7 +90,7 @@ void PJSipManager::clearAuthHooks()
static void *monitorThread(void *endpt)
{
- PJSipManager* endpoint = reinterpret_cast<PJSipManager*> (endpt);
+ PJSIPManager* endpoint = reinterpret_cast<PJSIPManager*> (endpt);
for (;;)
{
endpoint->handleEvents();
@@ -99,25 +99,25 @@ static void *monitorThread(void *endpt)
return NULL;
}
-PJSipManagerPtr AsteriskSCF::SipSessionManager::PJSipManager::create(const std::string& managerName,
+PJSIPManagerPtr AsteriskSCF::SIPSessionManager::PJSIPManager::create(const std::string& managerName,
const Ice::PropertiesPtr& properties)
{
- PJSipManagerPtr result(new PJSipManager);
+ PJSIPManagerPtr result(new PJSIPManager);
STUNModulePtr stunModule = STUNModule::create(result, managerName, properties, logger);
result->addModule("STUN", stunModule);
return result;
}
-PJSipManager::~PJSipManager()
+PJSIPManager::~PJSIPManager()
{
- for (SipModuleMap::iterator i = mModules.begin(); i != mModules.end(); ++i)
+ for (SIPModuleMap::iterator i = mModules.begin(); i != mModules.end(); ++i)
{
i->second->destroy();
i->second.reset();
}
//
- // It's pretty important that the transports don't take a reference to the PJSipManager,
+ // It's pretty important that the transports don't take a reference to the PJSIPManager,
// otherwise we'd never get here.
//
for (map<string, TransportPtr>::iterator i = mTransports.begin(); i != mTransports.end(); ++i)
@@ -128,57 +128,57 @@ PJSipManager::~PJSipManager()
}
-void PJSipManager::registerSessionModule(const boost::shared_ptr<SipEndpointFactory>& endpointFactoryPtr,
+void PJSIPManager::registerSessionModule(const boost::shared_ptr<SIPEndpointFactory>& endpointFactoryPtr,
const AsteriskSCF::Discovery::SmartProxy<
AsteriskSCF::SessionCommunications::V1::SessionRouterPrx>& sessionRouter,
const AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx& serviceLocator,
- const SipReplicationContextPtr& replicationContext,
+ const SIPReplicationContextPtr& replicationContext,
const Ice::ObjectAdapterPtr& adapter,
const AsteriskSCF::Core::Discovery::V1::ServiceLocatorManagementPrx& serviceLocatorManagement
)
{
- mSessionModule = new PJSipSessionModule(mEndpoint, endpointFactoryPtr, sessionRouter,
+ mSessionModule = new PJSIPSessionModule(mEndpoint, endpointFactoryPtr, sessionRouter,
serviceLocator, replicationContext, adapter, serviceLocatorManagement);
}
-void PJSipManager::registerLoggingModule()
+void PJSIPManager::registerLoggingModule()
{
- mLoggingModule = new PJSipLoggingModule(mEndpoint);
+ mLoggingModule = new PJSIPLoggingModule(mEndpoint);
}
-void PJSipManager::registerRegistrarModule(
+void PJSIPManager::registerRegistrarModule(
const RegistrarListenerPrx& defaultListener,
- const SipReplicationContextPtr& replicationContext,
+ const SIPReplicationContextPtr& replicationContext,
const Ice::ObjectAdapterPtr& adapter)
{
- mRegistrarModule = new PJSipRegistrarModule(mEndpoint, defaultListener, replicationContext);
+ mRegistrarModule = new PJSIPRegistrarModule(mEndpoint, defaultListener, replicationContext);
//The registrar implements a published interface, so we need to add it to
//the object adapter
adapter->add(mRegistrarModule->getRegistrar(),
adapter->getCommunicator()->stringToIdentity(RegistrarId));
}
-pjsip_endpoint* PJSipManager::getEndpoint()
+pjsip_endpoint* PJSIPManager::getEndpoint()
{
return mEndpoint;
}
-PJSipSessionModulePtr PJSipManager::getSessionModule()
+PJSIPSessionModulePtr PJSIPManager::getSessionModule()
{
return mSessionModule;
}
-PJSipLoggingModulePtr PJSipManager::getLoggingModule()
+PJSIPLoggingModulePtr PJSIPManager::getLoggingModule()
{
return mLoggingModule;
}
-PJSipRegistrarModulePtr PJSipManager::getRegistrarModule()
+PJSIPRegistrarModulePtr PJSIPManager::getRegistrarModule()
{
return mRegistrarModule;
}
-void PJSipManager::addTransport(const string& id, const TransportPtr& transport)
+void PJSIPManager::addTransport(const string& id, const TransportPtr& transport)
{
//
// Reap destroyed transports and add the new one.
@@ -199,7 +199,7 @@ void PJSipManager::addTransport(const string& id, const TransportPtr& transport)
mTransports.insert(make_pair(id, transport));
}
-TransportPtr PJSipManager::getTransport(const string& id)
+TransportPtr PJSIPManager::getTransport(const string& id)
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
map<string, TransportPtr>::iterator i = mTransports.begin();
@@ -222,10 +222,10 @@ TransportPtr PJSipManager::getTransport(const string& id)
return TransportPtr();
}
-void PJSipManager::addModule(const string& moduleName, const SipModulePtr& module)
+void PJSIPManager::addModule(const string& moduleName, const SIPModulePtr& module)
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
- SipModuleMap::iterator i = mModules.find(moduleName);
+ SIPModuleMap::iterator i = mModules.find(moduleName);
if (i != mModules.end())
{
mModules.erase(i);
@@ -233,35 +233,35 @@ void PJSipManager::addModule(const string& moduleName, const SipModulePtr& modul
mModules.insert(make_pair(moduleName, module));
}
-SipModulePtr PJSipManager::getModule(const string& moduleName)
+SIPModulePtr PJSIPManager::getModule(const string& moduleName)
{
boost::shared_lock<boost::shared_mutex> lock(mLock);
- SipModuleMap::const_iterator i = mModules.find(moduleName);
+ SIPModuleMap::const_iterator i = mModules.find(moduleName);
if (i != mModules.end())
{
return i->second;
}
- return SipModulePtr();
+ return SIPModulePtr();
}
-void PJSipManager::handleEvents()
+void PJSIPManager::handleEvents()
{
onHandleEvents(mModules);
const pj_time_val delay = {0, 10};
pjsip_endpt_handle_events(mEndpoint, &delay);
}
-pj_caching_pool* PJSipManager::getCachingPool()
+pj_caching_pool* PJSIPManager::getCachingPool()
{
return &mCachingPool;
}
-pj_pool_t* PJSipManager::getMemoryPool()
+pj_pool_t* PJSIPManager::getMemoryPool()
{
return mMemoryPool;
}
-PJSipManager::PJSipManager() :
+PJSIPManager::PJSIPManager() :
mEndpoint(0),
mSessionModule(0),
mLoggingModule(0),
@@ -297,6 +297,6 @@ PJSipManager::PJSipManager() :
}
}
-}; //End namespace SipSessionManager
+}; //End namespace SIPSessionManager
}; //End namespace AsteriskSCF
diff --git a/src/PJSipManager.h b/src/PJSIPManager.h
similarity index 69%
rename from src/PJSipManager.h
rename to src/PJSIPManager.h
index 98813be..f718ae7 100644
--- a/src/PJSipManager.h
+++ b/src/PJSIPManager.h
@@ -32,42 +32,42 @@
#include <AsteriskSCF/System/Hook/HookIf.h>
#include "Transports.h"
-#include "SipModule.h"
-#include "SipReplicationContext.h"
-#include "SipClientRegistration.h"
+#include "SIPModule.h"
+#include "SIPReplicationContext.h"
+#include "SIPClientRegistration.h"
namespace AsteriskSCF
{
-namespace SipSessionManager
+namespace SIPSessionManager
{
-class PJSipManager;
-typedef boost::shared_ptr<PJSipManager> PJSipManagerPtr;
+class PJSIPManager;
+typedef boost::shared_ptr<PJSIPManager> PJSIPManagerPtr;
-class PJSipSessionModule;
-typedef IceUtil::Handle<PJSipSessionModule> PJSipSessionModulePtr;
+class PJSIPSessionModule;
+typedef IceUtil::Handle<PJSIPSessionModule> PJSIPSessionModulePtr;
-class PJSipRegistrarModule;
-typedef IceUtil::Handle<PJSipRegistrarModule> PJSipRegistrarModulePtr;
+class PJSIPRegistrarModule;
+typedef IceUtil::Handle<PJSIPRegistrarModule> PJSIPRegistrarModulePtr;
-class PJSipLoggingModule;
-typedef IceUtil::Handle<PJSipLoggingModule> PJSipLoggingModulePtr;
+class PJSIPLoggingModule;
+typedef IceUtil::Handle<PJSIPLoggingModule> PJSIPLoggingModulePtr;
/*
* This class is responsible for providing access to the pjsip_endpoint for the Asterisk SCF SIP component.
*
* In addition, it provides some common functions that many SIP services will use.
*/
-class PJSipManager : public boost::enable_shared_from_this<PJSipManager>
+class PJSIPManager : public boost::enable_shared_from_this<PJSIPManager>
{
public:
- static PJSipManagerPtr create(const std::string& managerName, const Ice::PropertiesPtr& properties);
+ static PJSIPManagerPtr create(const std::string& managerName, const Ice::PropertiesPtr& properties);
- virtual ~PJSipManager();
+ virtual ~PJSIPManager();
/**
- * Get a handle to the PJSipEndpoint for operations
+ * Get a handle to the PJSIPEndpoint for operations
* that may require it
*/
pjsip_endpoint *getEndpoint();
@@ -75,12 +75,12 @@ public:
/**
* Get a reference to the PJSIP session module
*/
- PJSipSessionModulePtr getSessionModule();
+ PJSIPSessionModulePtr getSessionModule();
/**
... 9477 lines suppressed ...
--
asterisk-scf/release/sip.git
More information about the asterisk-scf-commits
mailing list