diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-10-09 15:00:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-10-09 15:00:57 +0200 |
| commit | 20b6c0ccb95118ffc685826904a8edd06a38ac1b (patch) | |
| tree | 1b389964fa35ca9de23c548120ecedcc9d82074c /cpp/src/IceSSL/OpenSSLTransceiverI.cpp | |
| parent | Merge branch '3.6' (diff) | |
| download | ice-20b6c0ccb95118ffc685826904a8edd06a38ac1b.tar.bz2 ice-20b6c0ccb95118ffc685826904a8edd06a38ac1b.tar.xz ice-20b6c0ccb95118ffc685826904a8edd06a38ac1b.zip | |
Added ready callback to allow transports to signal readiness to the thread pool
Diffstat (limited to 'cpp/src/IceSSL/OpenSSLTransceiverI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLTransceiverI.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp index 244a79d4c6e..ff9563db0de 100644 --- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp @@ -83,7 +83,7 @@ IceSSL::TransceiverI::getNativeInfo() } IceInternal::SocketOperation -IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer, bool&) +IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer) { IceInternal::SocketOperation status = _stream->connect(readBuffer, writeBuffer); if(status != IceInternal::SocketOperationNone) @@ -440,7 +440,7 @@ IceSSL::TransceiverI::write(IceInternal::Buffer& buf) } IceInternal::SocketOperation -IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool&) +IceSSL::TransceiverI::read(IceInternal::Buffer& buf) { if(!_stream->isConnected()) { @@ -448,8 +448,7 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool&) } // - // Note: we don't set the hasMoreData flag in this implementation. - // We assume that OpenSSL doesn't read more SSL records than + // Note: We assume that OpenSSL doesn't read more SSL records than // necessary to fill the requested data and that the sender sends // Ice messages in individual SSL records. // |