[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "configuration" updated.

[Commits to the Asterisk SCF project code repositories]

branch "configuration" has been updated
       via  4c5178bacdf897e9717c93187b2bcb657f2e1871 (commit)
      from  d17c5711691e51a7a46e787da409c568e8dc6cfd (commit)

Summary of changes:
 local-slice/SipConfigurationIf.ice |   14 +++++++-------
 src/SipConfiguration.cpp           |   10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit 4c5178bacdf897e9717c93187b2bcb657f2e1871
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Mar 7 10:52:29 2011 -0400

    Remove underscores and don't use None since python uses it.

diff --git a/local-slice/SipConfigurationIf.ice b/local-slice/SipConfigurationIf.ice
index 0df317c..9fa7d55 100644
--- a/local-slice/SipConfigurationIf.ice
+++ b/local-slice/SipConfigurationIf.ice
@@ -188,11 +188,11 @@ module V1
     */
    enum TLSProtocolMethod
    {
-       PROTOCOL_METHOD_UNSPECIFIED,
-       PROTOCOL_METHOD_TLSV1,
-       PROTOCOL_METHOD_SSLV2,
-       PROTOCOL_METHOD_SSLV3,
-       PROTOCOL_METHOD_SSLV23,
+       PROTOCOLMETHODUNSPECIFIED,
+       PROTOCOLMETHODTLSV1,
+       PROTOCOLMETHODSSLV2,
+       PROTOCOLMETHODSSLV3,
+       PROTOCOLMETHODSSLV23,
    };
 
    /**
@@ -203,7 +203,7 @@ module V1
        /**
 	* TLS protocol method to use
 	*/
-       TLSProtocolMethod protocolMethod = PROTOCOL_METHOD_UNSPECIFIED;
+       TLSProtocolMethod protocolMethod = PROTOCOLMETHODUNSPECIFIED;
 
        /**
 	* Supported ciphers (OpenSSL format)
@@ -316,7 +316,7 @@ module V1
     */
    enum SipAllowableCallDirection
    {
-      None,
+      Disabled,
       Inbound,
       Outbound,
       Both,
diff --git a/src/SipConfiguration.cpp b/src/SipConfiguration.cpp
index 599d87b..713aa9c 100644
--- a/src/SipConfiguration.cpp
+++ b/src/SipConfiguration.cpp
@@ -774,23 +774,23 @@ void ConfigurationServiceImpl::setConfiguration(const AsteriskSCF::System::Confi
 
 		void visitSipCryptoItem(const ::AsteriskSCF::SIP::V1::SipCryptoItemPtr& cryptoItem)
 		{
-		    if (cryptoItem->protocolMethod == PROTOCOL_METHOD_UNSPECIFIED)
+		    if (cryptoItem->protocolMethod == PROTOCOLMETHODUNSPECIFIED)
 		    {
 			mLocalTransport->mTLSSettings.method = PJSIP_SSL_UNSPECIFIED_METHOD;
 		    }
-		    else if (cryptoItem->protocolMethod == PROTOCOL_METHOD_TLSV1)
+		    else if (cryptoItem->protocolMethod == PROTOCOLMETHODTLSV1)
 		    {
 			mLocalTransport->mTLSSettings.method = PJSIP_TLSV1_METHOD;
 		    }
-		    else if (cryptoItem->protocolMethod == PROTOCOL_METHOD_SSLV2)
+		    else if (cryptoItem->protocolMethod == PROTOCOLMETHODSSLV2)
 		    {
 			mLocalTransport->mTLSSettings.method = PJSIP_SSLV2_METHOD;
 		    }
-		    else if (cryptoItem->protocolMethod == PROTOCOL_METHOD_SSLV3)
+		    else if (cryptoItem->protocolMethod == PROTOCOLMETHODSSLV3)
 		    {
 			mLocalTransport->mTLSSettings.method = PJSIP_SSLV3_METHOD;
 		    }
-		    else if (cryptoItem->protocolMethod == PROTOCOL_METHOD_SSLV23)
+		    else if (cryptoItem->protocolMethod == PROTOCOLMETHODSSLV23)
 		    {
 			mLocalTransport->mTLSSettings.method = PJSIP_SSLV23_METHOD;
 		    }

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git