diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-03-09 09:17:02 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-03-09 09:17:02 -0230 |
| commit | 936b7a70c2729bf72f35ed6c7bc4c46222aeec8b (patch) | |
| tree | e8986ae58bc445ef60ad7de342c5cc2bc87d1775 | |
| parent | ICE-6353 - IceStorm/Freeze/BerkeleyDB: PANIC: Too many open files (diff) | |
| download | ice-936b7a70c2729bf72f35ed6c7bc4c46222aeec8b.tar.bz2 ice-936b7a70c2729bf72f35ed6c7bc4c46222aeec8b.tar.xz ice-936b7a70c2729bf72f35ed6c7bc4c46222aeec8b.zip | |
Fixed crash on Windows related to buffer size changes
| -rw-r--r-- | cpp/src/Ice/TcpTransceiver.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLTransceiverI.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SChannelTransceiverI.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SecureTransportTransceiverI.cpp | 7 |
4 files changed, 20 insertions, 8 deletions
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp index af456168cf5..ee022c639e9 100644 --- a/cpp/src/Ice/TcpTransceiver.cpp +++ b/cpp/src/Ice/TcpTransceiver.cpp @@ -107,8 +107,11 @@ IceInternal::TcpTransceiver::getInfo() const { Ice::TCPConnectionInfoPtr info = new Ice::TCPConnectionInfo(); fdToAddressAndPort(_stream->fd(), info->localAddress, info->localPort, info->remoteAddress, info->remotePort); - info->rcvSize = getRecvBufferSize(_stream->fd()); - info->sndSize = getSendBufferSize(_stream->fd()); + if(_stream->fd() != INVALID_SOCKET) + { + info->rcvSize = getRecvBufferSize(_stream->fd()); + info->sndSize = getSendBufferSize(_stream->fd()); + } return info; } diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp index 24762938607..5edf2874221 100644 --- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp @@ -565,8 +565,11 @@ IceSSL::TransceiverI::getNativeConnectionInfo() const NativeConnectionInfoPtr info = new NativeConnectionInfo(); IceInternal::fdToAddressAndPort(_stream->fd(), info->localAddress, info->localPort, info->remoteAddress, info->remotePort); - info->rcvSize = IceInternal::getRecvBufferSize(_stream->fd()); - info->sndSize = IceInternal::getSendBufferSize(_stream->fd()); + if(_stream->fd() != INVALID_SOCKET) + { + info->rcvSize = IceInternal::getRecvBufferSize(_stream->fd()); + info->sndSize = IceInternal::getSendBufferSize(_stream->fd()); + } if(_ssl != 0) { diff --git a/cpp/src/IceSSL/SChannelTransceiverI.cpp b/cpp/src/IceSSL/SChannelTransceiverI.cpp index bce721eec79..588d21917ef 100644 --- a/cpp/src/IceSSL/SChannelTransceiverI.cpp +++ b/cpp/src/IceSSL/SChannelTransceiverI.cpp @@ -985,8 +985,11 @@ IceSSL::TransceiverI::getNativeConnectionInfo() const NativeConnectionInfoPtr info = new NativeConnectionInfo(); IceInternal::fdToAddressAndPort(_stream->fd(), info->localAddress, info->localPort, info->remoteAddress, info->remotePort); - info->rcvSize = IceInternal::getRecvBufferSize(_stream->fd()); - info->sndSize = IceInternal::getSendBufferSize(_stream->fd()); + if(_stream->fd() != INVALID_SOCKET) + { + info->rcvSize = IceInternal::getRecvBufferSize(_stream->fd()); + info->sndSize = IceInternal::getSendBufferSize(_stream->fd()); + } if(_sslInitialized) { diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp index 1e5c824ed1d..c384def1f59 100644 --- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp @@ -527,8 +527,11 @@ IceSSL::TransceiverI::getNativeConnectionInfo() const NativeConnectionInfoPtr info = new NativeConnectionInfo(); IceInternal::fdToAddressAndPort(_stream->fd(), info->localAddress, info->localPort, info->remoteAddress, info->remotePort); - info->rcvSize = IceInternal::getRecvBufferSize(_stream->fd()); - info->sndSize = IceInternal::getSendBufferSize(_stream->fd()); + if(_stream->fd() != INVALID_SOCKET) + { + info->rcvSize = IceInternal::getRecvBufferSize(_stream->fd()); + info->sndSize = IceInternal::getSendBufferSize(_stream->fd()); + } if(_ssl) { |