diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-10 08:47:19 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-10 08:47:19 +0200 |
| commit | b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80 (patch) | |
| tree | d3e9e9340064538a8dc7a645260d0eb3cdf55d63 /cpp/src/IceSSL/AcceptorI.cpp | |
| parent | Undo bogus change from an earlier commit. (diff) | |
| download | ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.tar.bz2 ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.tar.xz ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.zip | |
ICE-5582 (SOCKs test), ICE-5314 (HTTP proxies), major refactoring of networking code (addition of StreamSocket class abstraction)
Diffstat (limited to 'cpp/src/IceSSL/AcceptorI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/AcceptorI.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp index f55f1b2b2f4..2cb3f19515b 100644 --- a/cpp/src/IceSSL/AcceptorI.cpp +++ b/cpp/src/IceSSL/AcceptorI.cpp @@ -22,6 +22,7 @@ #include <Ice/LocalException.h> #include <Ice/LoggerUtil.h> #include <Ice/Properties.h> +#include <Ice/StreamSocket.h> #include <IceUtil/StringUtil.h> #ifdef ICE_USE_IOCP @@ -41,13 +42,8 @@ IceSSL::AcceptorI::getNativeInfo() #ifdef ICE_USE_IOCP IceInternal::AsyncInfo* -# ifndef NDEBUG -IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation status) -# else IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation) -# endif { - assert(status == IceInternal::SocketOperationRead); return &_info; } #endif @@ -167,7 +163,7 @@ IceSSL::AcceptorI::accept() // SSL handshaking is performed in TransceiverI::initialize, since // accept must not block. // - return new TransceiverI(_instance, fd, _adapterName); + return new TransceiverI(_instance, new IceInternal::StreamSocket(_instance, fd), "", _adapterName); } string |