From 1c7f93a50ec5038a953063118ad4160f57aa1d0c Mon Sep 17 00:00:00 2001 From: sma Date: Fri, 10 Aug 2012 14:01:17 +0000 Subject: Fri Aug 10 14:00:00 UTC 2012 Simon Massey MIOP Fragmentation --- TAO/tao/Connection_Handler.cpp | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'TAO/tao/Connection_Handler.cpp') diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index ff9fbfb745a..0030af8cb4b 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -61,10 +61,16 @@ TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock, && sock.set_option (SOL_SOCKET, SO_SNDBUF, (void *) &snd_size, - sizeof (snd_size)) == -1 - && errno != ENOTSUP) + sizeof (snd_size)) == -1) { - return -1; + if (TAO_debug_level) + ACE_DEBUG ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - Connection_Handler::") + ACE_TEXT ("set_socket_option, setting SO_SNDBUF failed ") + ACE_TEXT ("'%m'\n"))); + + if (errno != ENOTSUP) + return -1; } #endif /* !ACE_LACKS_SO_SNDBUF */ @@ -73,16 +79,22 @@ TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock, && sock.set_option (SOL_SOCKET, SO_RCVBUF, (void *) &rcv_size, - sizeof (int)) == -1 - && errno != ENOTSUP) + sizeof (int)) == -1) { - return -1; + if (TAO_debug_level) + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - Connection_Handler::") + ACE_TEXT ("set_socket_option, setting SO_RCVBUF failed ") + ACE_TEXT ("'%m'\n"))); + + if (errno != ENOTSUP) + return -1; } #endif /* !ACE_LACKS_SO_RCVBUF */ #if defined (ACE_LACKS_SO_SNDBUF) && defined (ACE_LACKS_SO_RCVBUF) - ACE_UNUSED_ARG (snd_size); - ACE_UNUSED_ARG (rcv_size); + ACE_UNUSED_ARG (snd_size); + ACE_UNUSED_ARG (rcv_size); #endif // Set the close-on-exec flag for that file descriptor. If the -- cgit v1.2.1