diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h | 67 |
1 files changed, 11 insertions, 56 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index cf181558596..0c582b853af 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -24,54 +24,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IIOP_SSL_Connect.h" +#include "IIOP_SSL_Connection_Handler.h" #include "tao/IIOP_Connector.h" -// **************************************************************** -/** - * @class TAO_IIOP_SSL_Connect_Creation_Strategy - * - * @brief Helper creation strategy - * - * Creates UIOP_Client_Connection_Handler objects but satisfies - * the interface required by the - * ACE_Creation_Strategy<TAO_IIOP_SSL_Client_Connection_Handler> - */ -class TAO_SSLIOP_Export TAO_IIOP_SSL_Connect_Creation_Strategy - : public ACE_Creation_Strategy<TAO_IIOP_SSL_Client_Connection_Handler> -{ -public: - /** - * Constructor. <arg> parameter is used to pass any special - * state/info to the service handler upon creation. Currently used - * by IIOP and UIOP to pass protocol configuration properties. - */ - TAO_IIOP_SSL_Connect_Creation_Strategy (ACE_Thread_Manager * = 0, - TAO_ORB_Core* orb_core = 0, - void *arg = 0, - CORBA::Boolean flag = 0); - - /// Default destructor g++, 2.7.2 appear to need it. - ~TAO_IIOP_SSL_Connect_Creation_Strategy (void); - - /// Makes TAO_IIOP_SSL_Client_Connection_Handlers - virtual int make_svc_handler (TAO_IIOP_SSL_Client_Connection_Handler *&sh); - -private: - - /// The ORB core. - TAO_ORB_Core* orb_core_; - - /// Some info/state to be passed to the service handler we create. - void *arg_; - - /// Are we using GIOP lite? - CORBA::Boolean lite_flag_; -}; - -// **************************************************************** - /** * @class TAO_IIOP_SSL_Connector * @@ -102,28 +58,27 @@ public: public: - typedef ACE_NOOP_Concurrency_Strategy<TAO_IIOP_SSL_Client_Connection_Handler> - TAO_NULL_ACTIVATION_STRATEGY; + typedef TAO_Connect_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler> + TAO_IIOP_SSL_CONNECT_CONCURRENCY_STRATEGY; + + typedef TAO_Connect_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler> + TAO_IIOP_SSL_CONNECT_CREATION_STRATEGY; - typedef ACE_Connect_Strategy<TAO_IIOP_SSL_Client_Connection_Handler, + typedef ACE_Connect_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR> - TAO_CONNECT_STRATEGY ; + TAO_IIOP_SSL_CONNECT_STRATEGY ; - typedef ACE_Strategy_Connector<TAO_IIOP_SSL_Client_Connection_Handler, + typedef ACE_Strategy_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR> TAO_IIOP_SSL_BASE_CONNECTOR; private: - /// Our activation strategy - TAO_NULL_ACTIVATION_STRATEGY null_activation_strategy_; - /// Our connect strategy - TAO_CONNECT_STRATEGY connect_strategy_; + TAO_IIOP_SSL_CONNECT_STRATEGY connect_strategy_; - /// The connector initiating connection requests for IIOP. + /// The connector initiating connection requests for IIOP_SSL. TAO_IIOP_SSL_BASE_CONNECTOR base_connector_; - }; #include "ace/post.h" |