diff options
author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-30 21:08:06 +0000 |
---|---|---|
committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-30 21:08:06 +0000 |
commit | 9fc314810f14520000801312ab8c01cbb06c5d26 (patch) | |
tree | 3433f69cb584c0b3d26e8502fbd3ec32b93457a5 /TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | |
parent | d208f9ae31a0c7decca367cfeeb87039f3dd2a8a (diff) | |
download | ATCD-9fc314810f14520000801312ab8c01cbb06c5d26.tar.gz |
ChangeLogTag: Thu Sep 30 16:53:48 2004 Irfan Pyarali <irfan@oomworks.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index d602407c5f7..4bb445347fd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -1,7 +1,6 @@ #include "SSLIOP_Connector.h" #include "SSLIOP_OwnCredentials.h" #include "SSLIOP_Profile.h" -#include "SSLIOP_Util.h" #include "SSLIOP_X509.h" #include "orbsvcs/SecurityLevel2C.h" @@ -57,8 +56,7 @@ TAO::SSLIOP::Connector::Connector (::Security::QOP qop) : TAO::IIOP_SSL_Connector (), qop_ (qop), connect_strategy_ (), - base_connector_ (), - handler_state_ () + base_connector_ () { } @@ -76,11 +74,6 @@ TAO::SSLIOP::Connector::open (TAO_ORB_Core *orb_core) if (this->ACE_NESTED_CLASS (TAO, IIOP_SSL_Connector)::open (orb_core) == -1) return -1; - if (TAO::SSLIOP::Util::setup_handler_state (orb_core, - &(this->tcp_properties_), - this->handler_state_) != 0) - return -1; - // Our connect creation strategy CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0; @@ -88,7 +81,6 @@ TAO::SSLIOP::Connector::open (TAO_ORB_Core *orb_core) CONNECT_CREATION_STRATEGY (orb_core->thr_mgr (), orb_core, - &(this->handler_state_), 0 /* Forcibly disable TAO's GIOPlite feature. It introduces a security hole. */), -1); @@ -332,17 +324,17 @@ TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint, if (this->TAO_IIOP_Connector::check_prefix (endpoint) != 0) return 0; } - + // Determine the (first in a list of possibly > 1) endpoint address const char *comma_pos = ACE_OS::strchr (endpoint,','); const char *slash_pos = ACE_OS::strchr (endpoint,'/'); - if (comma_pos == 0 && slash_pos == 0) + if (comma_pos == 0 && slash_pos == 0) { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) SSLIOP_Connector::corbaloc_scan warning: ") - ACE_TEXT("supplied string contains no comma or slash: %s\n"), + ACE_TEXT("supplied string contains no comma or slash: %s\n"), endpoint)); } len = ACE_OS::strlen (endpoint); @@ -356,14 +348,14 @@ TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint, { len = comma_pos - endpoint; } - + //Create the corresponding profile TAO_Profile *ptmp = 0; if (ssl_only) ptmp = this->make_secure_profile (ACE_ENV_SINGLE_ARG_PARAMETER); else ptmp = this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER); - + ACE_CHECK_RETURN (0); return ptmp; } @@ -374,22 +366,22 @@ TAO::SSLIOP::Connector::check_prefix (const char *endpoint) { // Check for a valid string if (!endpoint || !*endpoint) return -1; // Failure - + const char *protocol[] = { "ssliop", "sslioploc" }; - + size_t first_slot = ACE_OS::strchr (endpoint, ':') - endpoint; - + size_t len0 = ACE_OS::strlen (protocol[0]); size_t len1 = ACE_OS::strlen (protocol[1]); - + // Check for the proper prefix in the IOR. If the proper prefix // isn't in the IOR then it is not an IOR we can use. if (first_slot == len0 && ACE_OS::strncmp (endpoint, protocol[0], len0) == 0) return 0; - + if (first_slot == len1 && ACE_OS::strncmp (endpoint, protocol[1], len1) == 0) return 0; - + // Failure: not an SSLIOP IOR // DO NOT throw an exception here. return -1; @@ -829,7 +821,7 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub, // Use the default certificate and private key, i.e. the one set // in the SSL_CTX that was used when creating the SSL data // structure. - + /** * @todo Check if the CredentialsCurator contains a default set * of SSLIOP OwnCredentials. |