diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 113 |
1 files changed, 49 insertions, 64 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 6c490946c88..99404e41e08 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -13,37 +13,9 @@ ACE_RCSID(TAO_SSLIOP, SSLIOP_Connector, "$Id$") -TAO_SSLIOP_Connect_Creation_Strategy:: -TAO_SSLIOP_Connect_Creation_Strategy (ACE_Thread_Manager* t, - TAO_ORB_Core *orb_core, - void *arg) - : ACE_Creation_Strategy<TAO_SSLIOP_Client_Connection_Handler> (t), - orb_core_ (orb_core), - arg_ (arg) -{ -} - -int -TAO_SSLIOP_Connect_Creation_Strategy::make_svc_handler - (TAO_SSLIOP_Client_Connection_Handler *&sh) -{ - if (sh == 0) - ACE_NEW_RETURN (sh, - TAO_SSLIOP_Client_Connection_Handler - (this->orb_core_->thr_mgr (), - this->orb_core_, - 0, - this->arg_), - -1); - return 0; -} - -// **************************************************************** - TAO_SSLIOP_Connector::TAO_SSLIOP_Connector (int no_protection) : TAO_IIOP_SSL_Connector (), no_protection_ (no_protection), - null_activation_strategy_ (), connect_strategy_ (), base_connector_ () { @@ -55,19 +27,28 @@ TAO_SSLIOP_Connector::open (TAO_ORB_Core *orb_core) if (this->TAO_IIOP_SSL_Connector::open (orb_core) == -1) return -1; - TAO_SSLIOP_Connect_Creation_Strategy *connect_creation_strategy = 0; + // Our connect creation strategy + TAO_SSLIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0; ACE_NEW_RETURN (connect_creation_strategy, - TAO_SSLIOP_Connect_Creation_Strategy - (this->orb_core ()->thr_mgr (), - this->orb_core (), - &(this->tcp_properties_)), + TAO_SSLIOP_CONNECT_CREATION_STRATEGY + (orb_core->thr_mgr (), + orb_core, + &(this->tcp_properties_), + this->lite_flag_), + -1); + + // Our activation strategy + TAO_SSLIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0; + + ACE_NEW_RETURN (concurrency_strategy, + TAO_SSLIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core), -1); return this->base_connector_.open (this->orb_core ()->reactor (), connect_creation_strategy, &this->connect_strategy_, - &this->null_activation_strategy_); + concurrency_strategy); } int @@ -76,6 +57,7 @@ TAO_SSLIOP_Connector::close (void) (void) this->TAO_IIOP_SSL_Connector::close (); delete this->base_connector_.creation_strategy (); + delete this->base_connector_.concurrency_strategy (); return this->base_connector_.close (); } @@ -177,7 +159,7 @@ TAO_SSLIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc, remote_address.set_port_number (ssl_component.port); int result = 0; - TAO_SSLIOP_Client_Connection_Handler *svc_handler = 0; + TAO_SSLIOP_Connection_Handler *svc_handler = 0; TAO_Connection_Handler *conn_handler = 0; // Check the Cache first for connections @@ -191,7 +173,7 @@ TAO_SSLIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc, // We have found a connection and a handler svc_handler = - ACE_dynamic_cast (TAO_SSLIOP_Client_Connection_Handler *, + ACE_dynamic_cast (TAO_SSLIOP_Connection_Handler *, conn_handler); } else @@ -309,36 +291,39 @@ TAO_SSLIOP_Connector::make_profile (const char *endpoint, #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_NOOP_Concurrency_Strategy<TAO_SSLIOP_Client_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_SSLIOP_Client_Connection_Handler>; -template class ACE_Creation_Strategy<TAO_SSLIOP_Client_Connection_Handler>; -template class ACE_Strategy_Connector<TAO_SSLIOP_Client_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; -template class ACE_Connect_Strategy<TAO_SSLIOP_Client_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; -template class ACE_Connector<TAO_SSLIOP_Client_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; -template class ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>; - -template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*>; -template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; -template class ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Client_Connection_Handler*>; + +template class TAO_Connect_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler>; +template class TAO_Connect_Creation_Strategy<TAO_SSLIOP_Connection_Handler>; +template class ACE_Strategy_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; +template class ACE_Connect_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; +template class ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; +template class ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>; + + +template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*>; +template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_SSLIOP_Client_Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO_SSLIOP_Client_Connection_Handler> -#pragma instantiate ACE_Strategy_Connector<TAO_SSLIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR> -#pragma instantiate ACE_Connect_Strategy<TAO_SSLIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR> - -#pragma instantiate ACE_Connector<TAO_SSLIOP_Client_Connection_Handler, ACE_SOCK_Connector> -#pragma instantiate ACE_Creation_Strategy<TAO_SSLIOP_Client_Connection_Handler> -#pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler> -#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*> -#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Client_Connection_Handler*> +#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate TAO_Connect_Creation_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate ACE_Strategy_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR> +#pragma instantiate ACE_Connect_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR> +#pragma instantiate ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR> +#pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> + +#pragma instantiate ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SOCK_CONNECTOR> +#pragma instantiate ACE_Creation_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> +#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*> +#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |