diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/TcpTransceiver.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/IceSSL/TransceiverI.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/IceSSL/TransceiverI.h | 6 |
3 files changed, 8 insertions, 6 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(...) diff --git a/cpp/src/IceSSL/TransceiverI.cpp b/cpp/src/IceSSL/TransceiverI.cpp index ec862faf22b..298d27096bb 100644 --- a/cpp/src/IceSSL/TransceiverI.cpp +++ b/cpp/src/IceSSL/TransceiverI.cpp @@ -955,6 +955,7 @@ IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance, SOCKET fd, const _instance(instance), _logger(instance->communicator()->getLogger()), _stats(instance->communicator()->getStats()), + _addr(IceInternal::Address()), _adapterName(adapterName), _incoming(true), _ssl(0), diff --git a/cpp/src/IceSSL/TransceiverI.h b/cpp/src/IceSSL/TransceiverI.h index 23d6da3975e..2c475c8638e 100644 --- a/cpp/src/IceSSL/TransceiverI.h +++ b/cpp/src/IceSSL/TransceiverI.h @@ -45,7 +45,7 @@ public: #ifdef ICE_USE_IOCP virtual IceInternal::AsyncInfo* getAsyncInfo(IceInternal::SocketOperation); #endif - + virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&); virtual void close(); virtual bool write(IceInternal::Buffer&); @@ -69,7 +69,7 @@ private: virtual ~TransceiverI(); virtual NativeConnectionInfoPtr getNativeConnectionInfo() const; - + #ifdef ICE_USE_IOCP bool receive(); bool send(); @@ -86,7 +86,7 @@ private: const InstancePtr _instance; const Ice::LoggerPtr _logger; const Ice::StatsPtr _stats; - + const IceInternal::NetworkProxyPtr _proxy; const std::string _host; const IceInternal::Address _addr; |