diff options
| author | Mark Spruiell <mes@zeroc.com> | 2013-04-04 21:39:01 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2013-04-04 21:39:01 -0700 |
| commit | a99a6a01294e2e027ba9de12426abe205fc52c0e (patch) | |
| tree | 2f84b39b379c6d82b89c1f9ffc3b9e2b63acdca0 /cpp/src/Ice/TcpTransceiver.cpp | |
| parent | * SOCKS support for C++ (diff) | |
| download | ice-a99a6a01294e2e027ba9de12426abe205fc52c0e.tar.bz2 ice-a99a6a01294e2e027ba9de12426abe205fc52c0e.tar.xz ice-a99a6a01294e2e027ba9de12426abe205fc52c0e.zip | |
fixing Linux compile issues for SOCKS/C++ changes
Diffstat (limited to 'cpp/src/Ice/TcpTransceiver.cpp')
| -rw-r--r-- | cpp/src/Ice/TcpTransceiver.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp index c577367c5fb..4ab90aec42f 100644 --- a/cpp/src/Ice/TcpTransceiver.cpp +++ b/cpp/src/Ice/TcpTransceiver.cpp @@ -573,6 +573,7 @@ IceInternal::TcpTransceiver::TcpTransceiver(const InstancePtr& instance, SOCKET IceInternal::TcpTransceiver::TcpTransceiver(const InstancePtr& instance, SOCKET fd) : NativeInfo(fd), + _addr(Address()), _traceLevels(instance->traceLevels()), _logger(instance->initializationData().logger), _stats(instance->initializationData().stats), @@ -615,13 +616,13 @@ IceInternal::TcpTransceiver::~TcpTransceiver() void IceInternal::TcpTransceiver::connect() { -#if !defined(ICE_USE_IOCP) +#ifndef ICE_USE_IOCP try { if(doConnect(_fd, _addr)) { _state = StateConnected; - _desc = fdToString(_fd, _proxy, _addr); + _desc = fdToString(_fd, _proxy, _addr, true); if(_traceLevels->network >= 1) { Trace out(_logger, _traceLevels->networkCat); @@ -630,7 +631,7 @@ IceInternal::TcpTransceiver::connect() } else { - _desc = fdToString(_fd, _proxy, _addr); + _desc = fdToString(_fd, _proxy, _addr, true); } } catch(...) |