diff options
| author | Mark Spruiell <mes@zeroc.com> | 2013-04-05 14:38:37 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2013-04-05 14:38:37 -0700 |
| commit | e65acd65e338ff567af3256a8c1df1f9d50aa909 (patch) | |
| tree | 4277cfb48e664c271ba8002150c8e5dc5f438c93 /cpp/src/IceSSL/TransceiverI.cpp | |
| parent | fixing Linux compile issues for SOCKS/C++ changes (diff) | |
| download | ice-e65acd65e338ff567af3256a8c1df1f9d50aa909.tar.bz2 ice-e65acd65e338ff567af3256a8c1df1f9d50aa909.tar.xz ice-e65acd65e338ff567af3256a8c1df1f9d50aa909.zip | |
dependency updates & Linux fixes
Diffstat (limited to 'cpp/src/IceSSL/TransceiverI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/TransceiverI.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/TransceiverI.cpp b/cpp/src/IceSSL/TransceiverI.cpp index 298d27096bb..fbf683d947d 100644 --- a/cpp/src/IceSSL/TransceiverI.cpp +++ b/cpp/src/IceSSL/TransceiverI.cpp @@ -933,10 +933,11 @@ IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance, SOCKET fd, const IceInternal::setTcpBufSize(fd, _instance->communicator()->getProperties(), _logger); #ifndef ICE_USE_IOCP - if(IceInternal::doConnect(_fd, addr)) + IceInternal::Address connectAddr = proxy ? proxy->getAddress() : addr; + if(IceInternal::doConnect(_fd, connectAddr)) { _state = StateConnected; - _desc = IceInternal::fdToString(_fd); + _desc = IceInternal::fdToString(_fd, _proxy, _addr, true); if(_instance->networkTraceLevel() >= 1) { Trace out(_logger, _instance->networkTraceCategory()); @@ -945,7 +946,7 @@ IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance, SOCKET fd, const } else { - _desc = IceInternal::fdToString(_fd); + _desc = IceInternal::fdToString(_fd, _proxy, _addr, true); } #endif } |