[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "modular-transport-refactor" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Jun 27 10:26:06 CDT 2011
branch "modular-transport-refactor" has been updated
via 5963cd0bcb35f29b6b3ea9051480e3115c43f2a2 (commit)
via 1de67641a3e4c2c0bfcfa244a455543af8797ac0 (commit)
via 0d651e8263be7bee4cbbf00f8e58f4b09e15f447 (commit)
via a6453ee3997ea4797c32ebd103a14f60bd6930d5 (commit)
via 85f9eed8c9e2add8d2cb62a7a5b84f5ec9e67bd5 (commit)
via 4cc73e761cbe287f3d79572a07054d22316e665a (commit)
via 7e5c7f003fefb179ba7d4861a6bbea00b74ff064 (commit)
via b49bbffd540cb56846df38c934fb05b14fbb61dd (commit)
via 14ca1270f07e4bd0ce0debd064cd5a4c9c8a0372 (commit)
via 8e234734142c206ccdf66647e05567b10d5cfd72 (commit)
via a04d0359ca706f2a8ce2a3b21464c9ba6e062785 (commit)
via 289eae68054b0f290bdab7f0e14660493548dadf (commit)
via 3246440509df7b0d357d507039ab408e03a7a355 (commit)
via c486b08a719eca0b3bb87bb5faa81602e4c65ab6 (commit)
via 5f4c5725e89df126109a572417fd3f6ac36b3d8b (commit)
via 384cb9af005a7ca75d7599aa2f356e9904024a90 (commit)
via 09511d65f232bb4d04758c6e124a8649f20ad19b (commit)
via 397eed56f8c9621c4e6a3fc9910405d5acca69af (commit)
via e8b826ae01d1de3261627a3f75ab1bca6b337ce4 (commit)
via c75f3b9b6d21058d881faf51736b4221522cc7d3 (commit)
via d9ad2557af844f4241a8e9c42cdf7da57d63ac98 (commit)
from 929e1ffe1b4cd13a204adf33328c1fea1ca4da21 (commit)
Summary of changes:
.gitmodules | 9 -
CMakeLists.txt | 7 +-
cmake | 1 -
config/SipConfigurator.py | 62 ++++----
logger | 1 -
slice | 1 -
.../SipSessionManager}/SipConfigurationIf.ice | 15 ++-
.../SipSessionManager}/SipStateReplicationIf.ice | 18 ++-
{local-slice => slice}/SipIf.ice | 0
src/CMakeLists.txt | 135 +++++++--------
src/PJSipManager.cpp | 2 +-
src/PJSipManager.h | 2 +-
src/PJSipModule.h | 2 +-
src/PJSipSessionModule.cpp | 69 ++++++--
src/PJSipSessionModule.h | 5 +-
src/PJSipSessionModuleConstruction.cpp | 24 +++-
src/STUNTransportConfig.cpp | 15 +-
src/STUNTransportConfig.h | 4 +-
src/SipConfiguration.cpp | 66 ++++----
src/SipSession.cpp | 179 +++++++++++++++++++-
src/SipSession.h | 15 ++-
src/SipSessionManagerApp.cpp | 8 +-
src/SipStateReplicator.h | 10 +-
src/SipStateReplicatorApp.cpp | 13 +-
src/SipStateReplicatorListener.cpp | 3 +-
25 files changed, 455 insertions(+), 211 deletions(-)
delete mode 100644 .gitmodules
delete mode 160000 cmake
delete mode 160000 logger
delete mode 160000 slice
rename {local-slice => slice/AsteriskSCF/Configuration/SipSessionManager}/SipConfigurationIf.ice (98%)
rename {local-slice => slice/AsteriskSCF/Replication/SipSessionManager}/SipStateReplicationIf.ice (95%)
rename {local-slice => slice}/SipIf.ice (100%)
- Log -----------------------------------------------------------------
commit 5963cd0bcb35f29b6b3ea9051480e3115c43f2a2
Merge: 929e1ff 1de6764
Author: Brent Eagles <beagles at digium.com>
Date: Mon Jun 27 12:55:43 2011 -0230
Merge branch 'master' into modular-transport-refactor
diff --cc slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice
index f8ae0b7,849992d..c8855d3
--- a/slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice
+++ b/slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice
@@@ -27,392 -32,382 +32,396 @@@ module SipSessionManage
["suppress"]
module V1
{
- /**
- * Service locator category for finding the configuration service
- */
- const string ConfigurationDiscoveryCategory = "SipConfiguration";
-
- /**
- * Service locator parameters class for discovering the configuration service
- */
- unsliceable class SipConfigurationParams extends AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams
- {
- /**
- * Unique name for the configuration service
- */
- string name;
- };
-
- /**
- * Local visitor class for visiting SIP configuration groups
- */
- local class SipConfigurationGroupVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationGroupVisitor
- {
- };
-
- /**
- * Generic SIP configuration group
- */
- ["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
- {
- };
-
- /**
- * Local visitor class for visiting SIP configuration items
- */
- local class SipConfigurationItemVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationItemVisitor
- {
- };
-
- /**
- * Generic SIP configuration item
- */
- ["visitor:SipConfigurationItemVisitor"] class SipConfigurationItem extends AsteriskSCF::System::Configuration::V1::ConfigurationItem
- {
- };
-
- /**
- * SIP Endpoint group, used to configure an endpoint
- */
- class SipEndpointGroup extends SipConfigurationGroup
- {
- /**
- * Name of the endpoint being configured
- */
- string name;
- };
-
- /**
- * SIP Domain group, used to configure a specific domain
- */
- class SipDomainGroup extends SipConfigurationGroup
- {
- /**
- * Name of the domain being configured
- */
- string domain;
- };
-
- /**
- * Domain item for bindings
- */
- class SipBindingsItem extends SipConfigurationItem
- {
- /**
- * Addresses the domain is reachable over
- */
- Ice::StringSeq bindings;
- };
-
- /**
- * Generic SIP transport group that others derive from, primarily created since each one has
- * the requirement of a name
- */
- ["visitor:SipConfigurationGroupVisitor"] class SipTransportGroup extends SipConfigurationGroup
- {
- /**
- * Name of the specific transport. Since each one may have multiple transports this differentiates
- * them.
- */
- string name;
- };
-
- /**
- * Host information configuration item
- */
- ["visitor:SipConfigurationItemVisitor"] class SipHostItem extends SipConfigurationItem
- {
- /**
- * String containing the IP address or string address
- */
- string host;
-
- /**
- * Port number
- */
- int port;
- };
-
- /**
- * Source transport address configuration item
- */
- ["visitor:SipConfigurationItemVisitor"] class SipSourceTransportAddressItem extends SipHostItem
- {
- };
-
- /**
- * Target destination address configuration item
- */
- ["visitor:SipConfigurationItemVisitor"] class SipTargetDestinationAddressItem extends SipHostItem
- {
- };
-
- /**
- * Crypto certificate configuration item
- */
- class SipCryptoCertificateItem extends SipConfigurationItem
- {
- /**
- * Full location of certificate authority file
- */
- string certificateAuthority;
-
- /**
- * Full location of certificate file
- */
- string certificate;
-
- /**
- * Full location of private key file
- */
- string privateKey;
-
- /**
- * Password to open private key file
- */
- string privateKeyPassword;
- };
-
- /**
- * Crypto requirement configuration item
- */
- class SipCryptoRequirementsItem extends SipConfigurationItem
- {
- /**
- * Require verification of server certificate
- */
- bool requireVerifiedServer = false;
-
- /**
- * Require verification of client certificate
- */
- bool requireVerifiedClient = false;
-
- /**
- * Require client certificate be present
- */
- bool requireClientCertificate = false;
- };
-
- /**
- * TLS protocol methods
- */
- enum TLSProtocolMethod
- {
- PROTOCOLMETHODUNSPECIFIED,
- PROTOCOLMETHODTLSV1,
- PROTOCOLMETHODSSLV2,
- PROTOCOLMETHODSSLV3,
- PROTOCOLMETHODSSLV23,
- };
-
- /**
- * General crypto configuration item
- */
- class SipCryptoItem extends SipConfigurationItem
- {
- /**
- * TLS protocol method to use
- */
- TLSProtocolMethod protocolMethod = PROTOCOLMETHODUNSPECIFIED;
-
- /**
- * Supported ciphers (OpenSSL format)
- */
- string supportedCiphers;
-
- /**
- * Server name
- */
- string serverName;
-
- /**
- * TLS negotiation timeout in seconds
- */
- int timeout = 0;
- };
-
- /**
- * Routing service configuration item
- */
- class SipRoutingItem extends SipConfigurationItem
- {
- /**
- * Name of the routing service to use
- */
- string routingServiceName;
- };
-
- /**
- * RTP Media service configuration item
- */
- class SipRTPMediaServiceItem extends SipConfigurationItem
- {
- /**
- * Name of the RTP media service to use
- */
- string mediaServiceName;
-
- /**
- * Whether to choose an IPv6 RTP media service or not
- */
- bool requireIPv6 = false;
- };
-
- /**
- * Signaling NAT configuration item
- */
- class SipSignalingNATItem extends SipConfigurationItem
- {
- /**
- * Boolean for whether STUN is enabled
- */
- bool stun;
- };
-
- /**
- * Media NAT configuration item
- */
- class SipMediaNATItem extends SipConfigurationItem
- {
- /**
- * Boolean for whether symmetric RTP is enabled
- */
- bool symmetricRTP;
-
- /**
- * Boolean for whether STUN is enabled
- */
- bool stun;
-
- /**
- * Boolean for whether ICE is enabled
- */
- bool interactiveconnectivityestablishment;
-
- /**
- * Boolean for whether TURN is enabled
- */
- bool turn;
- };
-
- /**
- * Access control lists item
- */
- class SipACLItem extends SipConfigurationItem
- {
- /**
- * Name of this ACL item. A user may want to have multiple.
- */
- string name;
-
- /**
- * Ranges of allowed hosts
- */
- Ice::StringSeq allowRanges;
-
- /**
- * Specific allowed hosts
- */
- Ice::StringSeq allowHosts;
-
- /**
- * Ranges of denied hosts
- */
- Ice::StringSeq denyRanges;
-
- /**
- * Specific denied hosts
- */
- Ice::StringSeq denyHosts;
- };
-
- /**
- * Allowable call directions
- */
- enum SipAllowableCallDirection
- {
- Disabled,
- Inbound,
- Outbound,
- Both,
- };
-
- /**
- * Allowable call direction item
- */
- class SipAllowableCallDirectionItem extends SipConfigurationItem
- {
- /**
- * What direction is permitted for this endpoint
- */
- SipAllowableCallDirection callDirection = Both;
- };
-
- /**
- * User agent presentation configuration item
- */
- class SipUserAgentItem extends SipConfigurationItem
- {
- /**
- * String that our user agent should appear as
- */
- string userAgent;
- };
-
- /**
- * Transport information configuration item
- */
- class SipEndpointTransportItem extends SipConfigurationItem
- {
- /**
- * What directions to require secure transport in
- */
- SipAllowableCallDirection secureTransport = Disabled;
- };
-
- /**
- * Group of configuration items related to a UDP transport
- */
- ["visitor:SipConfigurationGroupVisitor"] class SipUDPTransportGroup extends SipTransportGroup
- {
- };
-
- /**
- * Group of configuration items related to a TCP transport
- */
- ["visitor:SipConfigurationGroupVisitor"] class SipTCPTransportGroup extends SipTransportGroup
- {
- };
-
- /**
- * Group of configuration items related to a TLS transport
- */
- ["visitor:SipConfigurationGroupVisitor"] class SipTLSTransportGroup extends SipTransportGroup
- {
- };
+
+/**
+ * Service locator category for finding the configuration service
+ */
+const string ConfigurationDiscoveryCategory = "SipConfiguration";
+
+/**
+ * Service locator parameters class for discovering the configuration service
+ */
+unsliceable class SipConfigurationParams extends AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams
+{
+ /**
+ * Unique name for the configuration service
+ */
+ string name;
+};
+
+/**
+ * Local visitor class for visiting SIP configuration groups
+ */
+local class SipConfigurationGroupVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationGroupVisitor
+{
+};
+
+/**
+ * Generic SIP configuration group
+ */
+["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
+{
+};
+
+/**
+ * Local visitor class for visiting SIP configuration items
+ */
+local class SipConfigurationItemVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationItemVisitor
+{
+};
+
+/**
+ * Generic SIP configuration item
+ */
+["visitor:SipConfigurationItemVisitor"] class SipConfigurationItem extends AsteriskSCF::System::Configuration::V1::ConfigurationItem
+{
+};
+
+/**
+ * SIP Endpoint group, used to configure an endpoint
+ */
+class SipEndpointGroup extends SipConfigurationGroup
+{
+ /**
+ * Name of the endpoint being configured
+ */
+ string name;
+};
+
+/**
+ * SIP Domain group, used to configure a specific domain
+ */
+class SipDomainGroup extends SipConfigurationGroup
+{
+ /**
+ * Name of the domain being configured
+ */
+ string domain;
+};
+
+/**
+ * Domain item for bindings
+ */
+class SipBindingsItem extends SipConfigurationItem
+{
+ /**
+ * Addresses the domain is reachable over
+ */
+ Ice::StringSeq bindings;
+};
+
+/**
+ * Generic SIP transport group that others derive from, primarily created since each one has
+ * the requirement of a name
+ */
+["visitor:SipConfigurationGroupVisitor"] class SipTransportGroup extends SipConfigurationGroup
+{
+ /**
+ * Name of the specific transport. Since each one may have multiple transports this differentiates
+ * them.
+ */
+ string name;
+};
+
+/**
+ * Host information configuration item
+ */
+["visitor:SipConfigurationItemVisitor"] class SipHostItem extends SipConfigurationItem
+{
+ /**
+ * String containing the IP address or string address
+ */
+ string host;
+
+ /**
+ * Port number
+ */
+ int port;
+};
+
+/**
+ * Source transport address configuration item
+ */
+["visitor:SipConfigurationItemVisitor"] class SipSourceTransportAddressItem extends SipHostItem
+{
+};
+
+/**
+ * Target destination address configuration item
+ */
+["visitor:SipConfigurationItemVisitor"] class SipTargetDestinationAddressItem extends SipHostItem
+{
+};
+
+/**
+ * Crypto certificate configuration item
+ */
+class SipCryptoCertificateItem extends SipConfigurationItem
+{
+ /**
+ * Full location of certificate authority file
+ */
+ string certificateAuthority;
+
+ /**
+ * Full location of certificate file
+ */
+ string certificate;
+
+ /**
+ * Full location of private key file
+ */
+ string privateKey;
+
+ /**
+ * Password to open private key file
+ */
+ string privateKeyPassword;
+};
+
+/**
+ * Crypto requirement configuration item
+ */
+class SipCryptoRequirementsItem extends SipConfigurationItem
+{
+ /**
+ * Require verification of server certificate
+ */
+ bool requireVerifiedServer = false;
+
+ /**
+ * Require verification of client certificate
+ */
+ bool requireVerifiedClient = false;
+
+ /**
+ * Require client certificate be present
+ */
+ bool requireClientCertificate = false;
+};
+
+/**
+ * TLS protocol methods
+ */
+enum TLSProtocolMethod
+{
+ PROTOCOLMETHODUNSPECIFIED,
+ PROTOCOLMETHODTLSV1,
+ PROTOCOLMETHODSSLV2,
+ PROTOCOLMETHODSSLV3,
+ PROTOCOLMETHODSSLV23,
+};
+
+/**
+ * General crypto configuration item
+ */
+class SipCryptoItem extends SipConfigurationItem
+{
+ /**
+ * TLS protocol method to use
+ */
+ TLSProtocolMethod protocolMethod = PROTOCOLMETHODUNSPECIFIED;
+
+ /**
+ * Supported ciphers (OpenSSL format)
+ */
+ string supportedCiphers;
+
+ /**
+ * Server name
+ */
+ string serverName;
+
+ /**
+ * TLS negotiation timeout in seconds
+ */
+ int timeout = 0;
+};
+
+/**
+ * Routing service configuration item
+ */
+class SipRoutingItem extends SipConfigurationItem
+{
+ /**
+ * Name of the routing service to use
+ */
+ string routingServiceName;
+};
+
+/**
+ * RTP Media service configuration item
+ */
+class SipRTPMediaServiceItem extends SipConfigurationItem
+{
+ /**
+ * Name of the RTP media service to use
+ */
+ string mediaServiceName;
+
+ /**
+ * Whether to choose an IPv6 RTP media service or not
+ */
+ bool requireIPv6 = false;
+};
+
+/**
+ * Signaling NAT configuration item
+ */
+class SipSignalingNATItem extends SipConfigurationItem
+{
+ /**
+ * Boolean for whether STUN is enabled
+ */
+ bool stun;
+};
+
+/**
+ * STUN server to be used by Sip signalling.
+ */
+class SipSignalingSTUNHostItem extends SipConfigurationItem
+{
+ /**
+ * Address for the STUN server.
+ **/
+ string address;
+
+ /**
+ * Port for the STUN host.
+ */
+ int port;
+};
+
+/**
+ * Media NAT configuration item
+ */
+class SipMediaNATItem extends SipConfigurationItem
+{
+ /**
+ * Boolean for whether ICE is enabled
+ */
+ bool enableICE;
+
+ /**
+ * Boolean for whether TURN is enabled
+ */
+ bool enableTURN;
+};
+
+/**
+ * Access control lists item
+ */
+class SipACLItem extends SipConfigurationItem
+{
+ /**
+ * Name of this ACL item. A user may want to have multiple.
+ */
+ string name;
+
+ /**
+ * Ranges of allowed hosts
+ */
+ Ice::StringSeq allowRanges;
+
+ /**
+ * Specific allowed hosts
+ */
+ Ice::StringSeq allowHosts;
+
+ /**
+ * Ranges of denied hosts
+ */
+ Ice::StringSeq denyRanges;
+
+ /**
+ * Specific denied hosts
+ */
+ Ice::StringSeq denyHosts;
+};
+
+/**
+ * Allowable call directions
+ */
+enum SipAllowableCallDirection
+{
+ Disabled,
+ Inbound,
+ Outbound,
+ Both,
+};
+
+/**
+ * Allowable call direction item
+ */
+class SipAllowableCallDirectionItem extends SipConfigurationItem
+{
+ /**
+ * What direction is permitted for this endpoint
+ */
+ SipAllowableCallDirection callDirection = Both;
+};
+
+/**
+ * User agent presentation configuration item
+ */
+class SipUserAgentItem extends SipConfigurationItem
+{
+ /**
+ * String that our user agent should appear as
+ */
+ string userAgent;
+};
+
+/**
+ * Transport information configuration item
+ */
+class SipEndpointTransportItem extends SipConfigurationItem
+{
+ /**
+ * What directions to require secure transport in
+ */
+ SipAllowableCallDirection secureTransport = Disabled;
+};
+
+/**
+ * Group of configuration items related to a UDP transport
+ */
+["visitor:SipConfigurationGroupVisitor"] class SipUDPTransportGroup extends SipTransportGroup
+{
+};
+
+/**
+ * Group of configuration items related to a TCP transport
+ */
+["visitor:SipConfigurationGroupVisitor"] class SipTCPTransportGroup extends SipTransportGroup
+{
+};
+
+/**
+ * Group of configuration items related to a TLS transport
+ */
+["visitor:SipConfigurationGroupVisitor"] class SipTLSTransportGroup extends SipTransportGroup
+{
+};
+
+/**
+ * Group of configuration items related to a STUN enabled transport
+ */
+["visitor:SipConfigurationGroupVisitor"] class SipSTUNTransportGroup extends SipTransportGroup
+{
+};
}; /* module V1 */
- }; /* module SIP */
- }; /* module Asterisk SCF */
+
+ }; /* module SipSessionManager */
+
-}; /* module Replication */
++}; /* module Configuration */
+
+ }; /* module AsteriskSCF */
diff --cc src/CMakeLists.txt
index ba47e6c,2412342..3086153
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -5,80 -5,57 +5,77 @@@ if(OPENSSL_FOUND
endif()
include_directories(${logger_dir}/include)
- include_directories(${ice-util-cpp_dir}/include)
- include_directories(${API_INCLUDE_DIR})
+ include_directories(${astscf-ice-util-cpp_dir}/include)
- asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+ astscf_component_init(SipSessionManager)
+ astscf_component_add_files(SipSessionManager SipSessionManagerApp.cpp)
+ 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 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 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 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_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_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 logging-client astscf-ice-util-cpp ${OPENSSL_LIBRARIES})
+
- asterisk_scf_component_init(SipSessionManager)
- asterisk_scf_component_add_file(SipSessionManager SipSessionManagerApp.cpp)
- asterisk_scf_component_add_file(SipSessionManager SipSessionManagerEventPublisher.cpp)
- asterisk_scf_component_add_file(SipSessionManager SipSessionManagerEventPublisher.h)
- asterisk_scf_component_add_file(SipSessionManager SipSessionManagerEndpointLocator.cpp)
- asterisk_scf_component_add_file(SipSessionManager SipSessionManagerEndpointLocator.h)
- asterisk_scf_component_add_file(SipSessionManager SipEndpointFactory.cpp)
- asterisk_scf_component_add_file(SipSessionManager SipEndpointFactory.h)
- asterisk_scf_component_add_file(SipSessionManager SipEndpoint.cpp)
- asterisk_scf_component_add_file(SipSessionManager SipEndpoint.h)
- asterisk_scf_component_add_file(SipSessionManager SipSession.cpp)
- asterisk_scf_component_add_file(SipSessionManager SipSession.h)
- asterisk_scf_component_add_file(SipSessionManager PJSipManager.cpp)
- asterisk_scf_component_add_file(SipSessionManager PJSipManager.h)
- asterisk_scf_component_add_file(SipSessionManager Transports.cpp)
- asterisk_scf_component_add_file(SipSessionManager Transports.h)
- asterisk_scf_component_add_file(SipSessionManager UDPTransport.cpp)
- asterisk_scf_component_add_file(SipSessionManager UDPTransport.h)
- asterisk_scf_component_add_file(SipSessionManager TCPTransport.cpp)
- asterisk_scf_component_add_file(SipSessionManager TCPTransport.h)
- asterisk_scf_component_add_file(SipSessionManager TLSTransport.cpp)
- asterisk_scf_component_add_file(SipSessionManager TLSTransport.h)
- asterisk_scf_component_add_file(SipSessionManager PJUtil.h)
- asterisk_scf_component_add_file(SipSessionManager DebugUtil.h)
- asterisk_scf_component_add_file(SipSessionManager SipModule.h)
- asterisk_scf_component_add_file(SipSessionManager STUNModule.cpp)
- asterisk_scf_component_add_file(SipSessionManager STUNModule.h)
- asterisk_scf_component_add_file(SipSessionManager STUNTransport.cpp)
- asterisk_scf_component_add_file(SipSessionManager STUNTransport.h)
- asterisk_scf_component_add_file(SipSessionManager STUNTransportConfig.cpp)
- asterisk_scf_component_add_file(SipSessionManager STUNTransportConfig.h)
- asterisk_scf_component_add_file(SipSessionManager NATOptions.h)
- asterisk_scf_component_add_file(SipSessionManager PJSipModule.cpp)
- asterisk_scf_component_add_file(SipSessionManager PJSipModule.h)
- asterisk_scf_component_add_file(SipSessionManager PJSipSessionModule.cpp)
- asterisk_scf_component_add_file(SipSessionManager PJSipSessionModuleConstruction.cpp)
- asterisk_scf_component_add_file(SipSessionManager PJSipSessionModule.h)
- asterisk_scf_component_add_file(SipSessionManager PJSipLoggingModule.cpp)
- asterisk_scf_component_add_file(SipSessionManager PJSipLoggingModuleConstruction.cpp)
- asterisk_scf_component_add_file(SipSessionManager PJSipLoggingModule.h)
- asterisk_scf_component_add_file(SipSessionManager SipConfiguration.cpp)
- asterisk_scf_component_add_file(SipSessionManager SipConfiguration.h)
- asterisk_scf_component_add_file(SipSessionManager SipStateReplicatorListener.cpp)
- asterisk_scf_component_add_file(SipSessionManager SipStateReplicator.h)
- asterisk_scf_component_add_slice(SipSessionManager ../local-slice/SipIf.ice)
- asterisk_scf_component_add_slice(SipSessionManager ../local-slice/SipStateReplicationIf.ice)
- asterisk_scf_component_add_slice(SipSessionManager ../local-slice/SipConfigurationIf.ice)
- asterisk_scf_component_add_ice_libraries(SipSessionManager IceStorm)
- asterisk_scf_component_add_boost_libraries(SipSessionManager core system)
- asterisk_scf_component_build_icebox(SipSessionManager)
- target_link_libraries(SipSessionManager logging-client ice-util-cpp ${OPENSSL_LIBRARIES})
pjproject_link(SipSessionManager pjsip)
pjproject_link(SipSessionManager pjmedia)
+pjproject_link(SipSessionManager pjnath)
pjproject_link(SipSessionManager pjlib-util)
pjproject_link(SipSessionManager pjlib)
- asterisk_scf_component_install(SipSessionManager)
+ astscf_component_install(SipSessionManager)
- asterisk_scf_component_init(SipStateReplicator)
- asterisk_scf_component_add_file(SipStateReplicator SipStateReplicatorApp.cpp)
- asterisk_scf_component_add_file(SipStateReplicator SipStateReplicator.h)
- asterisk_scf_component_add_slice(SipStateReplicator ../local-slice/SipStateReplicationIf.ice)
- asterisk_scf_component_add_slice(SipStateReplicator ../local-slice/SipIf.ice)
- asterisk_scf_component_add_slice(SipStateReplicator ../local-slice/SipConfigurationIf.ice)
- asterisk_scf_component_add_ice_libraries(SipStateReplicator IceStorm)
- asterisk_scf_component_add_ice_libraries(SipStateReplicator IceBox)
- asterisk_scf_component_add_boost_libraries(SipStateReplicator thread date_time)
- asterisk_scf_component_build_icebox(SipStateReplicator)
- target_link_libraries(SipStateReplicator logging-client)
- target_link_libraries(SipStateReplicator asterisk-scf-api)
- target_link_libraries(SipStateReplicator ice-util-cpp)
- asterisk_scf_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 logging-client astscf-ice-util-cpp)
+ astscf_component_install(SipStateReplicator)
diff --cc src/STUNTransportConfig.cpp
index b4d189d,0000000..a918234
mode 100644,000000..100644
--- a/src/STUNTransportConfig.cpp
+++ b/src/STUNTransportConfig.cpp
@@@ -1,130 -1,0 +1,131 @@@
+/*
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2011, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
+
+#include "STUNTransportConfig.h"
+#include "STUNTransport.h"
+#include "PJSipManager.h"
+
+using namespace AsteriskSCF::SipSessionManager;
++using namespace AsteriskSCF::Configuration::SipSessionManager::V1;
+
+namespace
+{
+
+ //
+ // Forward declarations.
+ //
+ class STUNTransportConfigImpl;
- AsteriskSCF::SIP::V1::SipConfigurationItemVisitorPtr visitorFactory(const IceUtil::Handle<STUNTransportConfigImpl>& config);
++ SipConfigurationItemVisitorPtr visitorFactory(const IceUtil::Handle<STUNTransportConfigImpl>& config);
+
+ class STUNTransportConfigImpl : public STUNTransportConfig
+ {
+ public:
+ STUNTransportConfigImpl(const PJSipManagerPtr& sipManager) :
+ mSipManager(sipManager),
- mGroup(new AsteriskSCF::SIP::V1::SipSTUNTransportGroup)
++ mGroup(new SipSTUNTransportGroup)
+ {
+ }
+
- AsteriskSCF::SIP::V1::SipConfigurationItemVisitorPtr getVisitor()
++ SipConfigurationItemVisitorPtr getVisitor()
+ {
+ return visitorFactory(this);
+ }
+
- AsteriskSCF::SIP::V1::SipSTUNTransportGroupPtr getTypedGroup()
++ SipSTUNTransportGroupPtr getTypedGroup()
+ {
+ return mGroup;
+ }
+
+ void update(const AsteriskSCF::Helpers::AddressPtr& stunServer, const AsteriskSCF::Helpers::AddressPtr& host)
+ {
+ if (stunServer || host)
+ {
+ boost::unique_lock<boost::shared_mutex> lock(mLock);
+ if (mTransport)
+ {
+ mTransport->destroy();
+ }
+ if (stunServer)
+ {
+ mSTUNServer = stunServer;
+ }
+ if (host)
+ {
+ mBindAddress = host;
+ }
+
+ if (mSTUNServer)
+ {
+ //
+ // We currently don't support creating a stun transport
+ // without a configured stun server.
+ //
+ mTransport = createSTUNTransport(mSipManager, mSTUNServer, mBindAddress);
+ }
+ }
+ }
+ private:
+
+ boost::shared_mutex mLock;
+ PJSipManagerPtr mSipManager;
+ AsteriskSCF::Helpers::AddressPtr mSTUNServer;
+ AsteriskSCF::Helpers::AddressPtr mBindAddress;
+ bool mUpdated;
+ TransportPtr mTransport;
- AsteriskSCF::SIP::V1::SipSTUNTransportGroupPtr mGroup;
++ SipSTUNTransportGroupPtr mGroup;
+ };
+
- class STUNConfigurationVisitor : public AsteriskSCF::SIP::V1::SipConfigurationItemVisitor
++ class STUNConfigurationVisitor : public SipConfigurationItemVisitor
+ {
+ public:
+ STUNConfigurationVisitor(const IceUtil::Handle<STUNTransportConfigImpl>& config) :
+ mConfig(config)
+ {
+ }
+
+ ~STUNConfigurationVisitor()
+ {
+ mConfig->update(mSTUNServer, mBindAddress);
+ }
+
+ void visitSipSignalingSTUNHostItem(const SipSignalingSTUNHostItemPtr& item)
+ {
+ mSTUNServer = AsteriskSCF::Helpers::AddressPtr(new AsteriskSCF::Helpers::Address(item->address, item->port));
+ }
+
+ void visitSipHostItem(const SipHostItemPtr& item)
+ {
+ mBindAddress = AsteriskSCF::Helpers::AddressPtr(new AsteriskSCF::Helpers::Address(item->host, item->port));
+ }
+ private:
+ IceUtil::Handle<STUNTransportConfigImpl> mConfig;
+
+ AsteriskSCF::Helpers::AddressPtr mSTUNServer;
+ AsteriskSCF::Helpers::AddressPtr mBindAddress;
+ };
+
- AsteriskSCF::SIP::V1::SipConfigurationItemVisitorPtr visitorFactory(const IceUtil::Handle<STUNTransportConfigImpl>& config)
++ SipConfigurationItemVisitorPtr visitorFactory(const IceUtil::Handle<STUNTransportConfigImpl>& config)
+ {
+ return new STUNConfigurationVisitor(config);
+ }
+}
+
+
+IceUtil::Handle<STUNTransportConfig>
+AsteriskSCF::SipSessionManager::STUNTransportConfig::create(const PJSipManagerPtr& sipManager)
+{
+ return new STUNTransportConfigImpl(sipManager);
+}
diff --cc src/STUNTransportConfig.h
index 5e0df8e,0000000..54143d0
mode 100644,000000..100644
--- a/src/STUNTransportConfig.h
+++ b/src/STUNTransportConfig.h
@@@ -1,52 -1,0 +1,52 @@@
+/*
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2011, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
+
+#pragma once
+
+#include "SipConfigurationIf.h"
+
+#include <IceUtil/Shared.h>
+#include <boost/shared_ptr.hpp>
+
+namespace AsteriskSCF
+{
+namespace SipSessionManager
+{
+//
+// Forward declarations.
+//
+class PJSipManager;
+typedef boost::shared_ptr<PJSipManager> PJSipManagerPtr;
+
+//
+// Note: STUN is an additional "feature" of the UDP transport.
+//
+
+class STUNTransportConfig : public IceUtil::Shared
+{
+public:
+
- virtual AsteriskSCF::SIP::V1::SipConfigurationItemVisitorPtr getVisitor() = 0;
++ virtual AsteriskSCF::Configuration::SipSessionManager::V1::SipConfigurationItemVisitorPtr getVisitor() = 0;
+
- virtual AsteriskSCF::SIP::V1::SipSTUNTransportGroupPtr getTypedGroup() = 0;
++ virtual AsteriskSCF::Configuration::SipSessionManager::V1::SipSTUNTransportGroupPtr getTypedGroup() = 0;
+
+ static IceUtil::Handle<STUNTransportConfig> create(const PJSipManagerPtr& sipManager);
+};
+
+typedef IceUtil::Handle<STUNTransportConfig> STUNTransportConfigPtr;
+
+} // End of namespace SipSessionManager
+} // End of namespace AsteriskSCF
diff --cc src/SipConfiguration.cpp
index 2e3a163,a9ed619..42e505e
--- a/src/SipConfiguration.cpp
+++ b/src/SipConfiguration.cpp
@@@ -30,16 -30,10 +30,16 @@@
#include "PJSipManager.h"
#include "SipEndpointFactory.h"
#include "SipConfiguration.h"
+
+#include "UDPTransport.h"
+#include "TCPTransport.h"
+#include "TLSTransport.h"
+#include "STUNTransportConfig.h"
#include <vector>
+#include <AsteriskSCF/Helpers/Network.h>
- using namespace AsteriskSCF::SIP::V1;
using namespace AsteriskSCF::System::Configuration::V1;
+ using namespace AsteriskSCF::Configuration::SipSessionManager::V1;
using namespace AsteriskSCF::Core::Routing::V1;
using namespace std;
@@@ -1311,12 -1242,7 +1311,12 @@@ ConfigurationGroupSeq ConfigurationServ
getGeneric<SipTLSTransportGroupPtr>(mImpl->getData(), group, mGroups);
};
- void visitSipSTUNTransportGroup(const ::AsteriskSCF::SIP::V1::SipSTUNTransportGroupPtr& group)
++ void visitSipSTUNTransportGroup(const SipSTUNTransportGroupPtr& group)
+ {
+ getGeneric<SipSTUNTransportGroupPtr>(mImpl->getData(), group, mGroups);
+ };
+
- void visitSipEndpointGroup(const ::AsteriskSCF::SIP::V1::SipEndpointGroupPtr& group)
+ void visitSipEndpointGroup(const SipEndpointGroupPtr& group)
{
getGeneric<SipEndpointGroupPtr>(mImpl->getData(), group, mGroups);
};
@@@ -1383,13 -1309,8 +1383,13 @@@ ConfigurationGroupSeq ConfigurationServ
{
genericGetAll<SipTLSTransportGroupPtr>(mImpl->getData(), group, mGroups);
};
+
+ void visitSipSTUNTransportGroup(const SipSTUNTransportGroupPtr& group)
+ {
+ genericGetAll<SipSTUNTransportGroupPtr>(mImpl->getData(), group, mGroups);
+ }
- void visitSipEndpointGroup(const ::AsteriskSCF::SIP::V1::SipEndpointGroupPtr& group)
+ void visitSipEndpointGroup(const SipEndpointGroupPtr& group)
{
genericGetAll<SipEndpointGroupPtr>(mImpl->getData(), group, mGroups);
};
@@@ -1470,12 -1391,7 +1470,12 @@@ void ConfigurationServiceImpl::setConfi
genericSet<SipTLSTransportGroupPtr>(mImpl->getData(), group);
};
+ void visitSipSTUNTransportGroup(const SipSTUNTransportGroupPtr& group)
+ {
+ genericSet<SipSTUNTransportGroupPtr>(mImpl->getData(), group);
+ }
+
- void visitSipEndpointGroup(const ::AsteriskSCF::SIP::V1::SipEndpointGroupPtr& group)
+ void visitSipEndpointGroup(const SipEndpointGroupPtr& group)
{
genericSet<SipEndpointGroupPtr>(mImpl->getData(), group);
};
@@@ -1527,12 -1443,7 +1527,12 @@@ void ConfigurationServiceImpl::removeCo
mImpl->getData()->removeFromGroup(group);
};
+ void visitSipSTUNTransportGroup(const SipSTUNTransportGroupPtr& group)
+ {
+ mImpl->getData()->removeFromGroup(group);
+ }
+
- void visitSipEndpointGroup(const ::AsteriskSCF::SIP::V1::SipEndpointGroupPtr& group)
+ void visitSipEndpointGroup(const SipEndpointGroupPtr& group)
{
mImpl->getData()->removeFromGroup(group);
};
@@@ -1582,12 -1493,7 +1582,12 @@@ void ConfigurationServiceImpl::removeCo
mImpl->getData()->remove(group);
};
+ void visitSipSTUNTransportGroup(const SipSTUNTransportGroupPtr& group)
+ {
+ mImpl->getData()->remove(group);
+ }
+
- void visitSipEndpointGroup(const ::AsteriskSCF::SIP::V1::SipEndpointGroupPtr& group)
+ void visitSipEndpointGroup(const SipEndpointGroupPtr& group)
{
mImpl->getData()->remove(group);
};
diff --cc src/SipSession.cpp
index ab342f0,972b5b0..33416a6
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@@ -246,9 -239,14 +246,14 @@@ public
AsteriskSCF::SessionCommunications::V1::BridgePrx mBridge;
/**
+ * Cookies present on the session.
+ */
+ AsteriskSCF::SessionCommunications::V1::SessionCookieDict mSessionCookies;
+
+ /**
* The PJSIP manager
*/
- PJSipManager *mManager;
+ PJSipManagerPtr mManager;
AsteriskSCF::Core::Discovery::V1::ServiceLocatorPrx mServiceLocator;
@@@ -331,25 -288,9 +336,26 @@@ void SipSession::initializePJSIPStructs
PJ_SUCCESS)
{
// What should we do here? Throw an exception?
+ lg(Error) << "Failed to create a UAC dialog!";
return;
}
+
+ if (transport)
+ {
+ pjsip_tpselector selector;
+ if (transport->initSelector(selector))
+ {
+ if(pjsip_dlg_set_transport(dialog, &selector) != PJ_SUCCESS)
+ {
+ //
+ // This would be pretty weird.. I guess if the transport no longer exists at this point.
+ // We could just roll along and see if the default transport selection in pjsip
+ // hooks us up.
+ //
+ }
+ }
+ }
+
mImplPriv->mDialog = dialog;
pjsip_inv_session *inviteSession;
diff --cc src/SipStateReplicator.h
index 2dcd1b6,135daed..9e98b8b
--- a/src/SipStateReplicator.h
+++ b/src/SipStateReplicator.h
@@@ -39,12 -39,12 +39,12 @@@ typedef IceUtil::Handle<SipStateReplica
//
struct SipStateReplicatorListenerImpl;
- class SipStateReplicatorListenerI : public AsteriskSCF::SIP::V1::SipStateReplicatorListener
+ class SipStateReplicatorListenerI : public AsteriskSCF::Replication::SipSessionManager::V1::SipStateReplicatorListener
{
public:
- SipStateReplicatorListenerI(const boost::shared_ptr<SipEndpointFactory>& factory, PJSipManager *manager);
+ SipStateReplicatorListenerI(const boost::shared_ptr<SipEndpointFactory>& factory, const PJSipManagerPtr& manager);
void stateRemoved(const Ice::StringSeq&, const Ice::Current&);
- void stateSet(const AsteriskSCF::SIP::V1::SipStateItemSeq&, const Ice::Current&);
+ void stateSet(const AsteriskSCF::Replication::SipSessionManager::V1::SipStateItemSeq&, const Ice::Current&);
bool operator==(const SipStateReplicatorListenerI &rhs);
private:
boost::shared_ptr<SipStateReplicatorListenerImpl> mImpl;
-----------------------------------------------------------------------
--
asterisk-scf/integration/sip.git
More information about the asterisk-scf-commits
mailing list