diff options
Diffstat (limited to 'TAO/tao/IIOP_Connection_Handler.cpp')
| -rw-r--r-- | TAO/tao/IIOP_Connection_Handler.cpp | 45 |
1 files changed, 13 insertions, 32 deletions
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index d74ee12594d..4ed86463f96 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -1,13 +1,13 @@ -#include "tao/IIOP_Connection_Handler.h" -#include "tao/debug.h" -#include "tao/ORB_Core.h" -#include "tao/IIOP_Transport.h" -#include "tao/IIOP_Endpoint.h" -#include "tao/IIOPC.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/Base_Transport_Property.h" -#include "tao/Protocols_Hooks.h" -#include "tao/Wait_Strategy.h" +#include "IIOP_Connection_Handler.h" +#include "debug.h" +#include "ORB_Core.h" +#include "IIOP_Transport.h" +#include "IIOP_Endpoint.h" +#include "IIOPC.h" +#include "Thread_Lane_Resources.h" +#include "Base_Transport_Property.h" +#include "Protocols_Hooks.h" +#include "Wait_Strategy.h" #include "ace/os_include/netinet/os_tcp.h" #include "ace/os_include/os_netdb.h" @@ -16,8 +16,6 @@ ACE_RCSID (tao, IIOP_Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_IIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), @@ -84,8 +82,6 @@ TAO_IIOP_Connection_Handler::open (void*) this->orb_core ()->orb_params ()->sock_rcvbuf_size (); protocol_properties.no_delay_ = this->orb_core ()->orb_params ()->nodelay (); - protocol_properties.keep_alive_ = - this->orb_core ()->orb_params ()->sock_keepalive (); TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (); @@ -132,19 +128,6 @@ TAO_IIOP_Connection_Handler::open (void*) return -1; #endif /* ! ACE_LACKS_TCP_NODELAY */ - if (protocol_properties.keep_alive_) - { - if (this->peer (). - set_option (SOL_SOCKET, - SO_KEEPALIVE, - (void *) &protocol_properties.keep_alive_, - sizeof (protocol_properties.keep_alive_)) == -1 - && errno != ENOTSUP) - { - return -1; - } - } - if (this->transport ()->wait_strategy ()->non_blocking () || this->transport ()->opened_as () == TAO::TAO_SERVER_ROLE) { @@ -253,7 +236,7 @@ TAO_IIOP_Connection_Handler::close_connection (void) { struct linger lval; lval.l_onoff = 1; - lval.l_linger = (u_short)linger; + lval.l_linger = linger; if (this->peer ().set_option(SOL_SOCKET, SO_LINGER, @@ -377,7 +360,7 @@ TAO_IIOP_Connection_Handler::process_listen_point_list ( ACE_TEXT("process_listen_point_list, ") ACE_TEXT("Listening port [%d] on [%s]\n"), listen_point.port, - ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ()))); + ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ()))); } // Construct an IIOP_Endpoint object using the host as provided @@ -421,7 +404,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio CORBA::Long codepoint = tph->get_dscp_codepoint (); - tos = static_cast<int> (codepoint) << 2; + tos = (int)(codepoint) << 2; } if (tos != this->dscp_codepoint_) @@ -479,5 +462,3 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio /* * End copy hook */ - -TAO_END_VERSIONED_NAMESPACE_DECL |