diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-06-27 17:54:30 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-06-27 17:54:30 +0200 |
| commit | c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7 (patch) | |
| tree | 5cb64dfe155e5d2349efb6c7dc4b0f5b5284d44a /cpp/src/Ice/TcpEndpointI.cpp | |
| parent | Fix Windows php build to restore nuget packages (diff) | |
| download | ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.tar.bz2 ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.tar.xz ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.zip | |
Refactored SSL and iAP transports, support for running SSL on top
of TCP/iAP/Bluetooth.
Diffstat (limited to 'cpp/src/Ice/TcpEndpointI.cpp')
| -rw-r--r-- | cpp/src/Ice/TcpEndpointI.cpp | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp index 1caadefbae2..2b2e26e924e 100644 --- a/cpp/src/Ice/TcpEndpointI.cpp +++ b/cpp/src/Ice/TcpEndpointI.cpp @@ -62,21 +62,19 @@ IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, Inp s->read(const_cast<bool&>(_compress)); } -EndpointInfoPtr -IceInternal::TcpEndpointI::getInfo() const +void +IceInternal::TcpEndpointI::streamWriteImpl(OutputStream* s) const { - TCPEndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<Ice::TCPEndpointInfo>, - ICE_DYNAMIC_CAST(TcpEndpointI, shared_from_this())); - fillEndpointInfo(info.get()); - return info; + IPEndpointI::streamWriteImpl(s); + s->write(_timeout); + s->write(_compress); } EndpointInfoPtr -IceInternal::TcpEndpointI::getWSInfo(const string& resource) const +IceInternal::TcpEndpointI::getInfo() const { - WSEndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<Ice::WSEndpointInfo>, shared_from_this()); + TCPEndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<Ice::TCPEndpointInfo>, shared_from_this()); fillEndpointInfo(info.get()); - info->resource = resource; return info; } @@ -254,14 +252,6 @@ IceInternal::TcpEndpointI::operator<(const LocalObject& r) const } void -IceInternal::TcpEndpointI::streamWriteImpl(OutputStream* s) const -{ - IPEndpointI::streamWriteImpl(s); - s->write(_timeout); - s->write(_compress); -} - -void IceInternal::TcpEndpointI::hashInit(Ice::Int& h) const { IPEndpointI::hashInit(h); @@ -385,7 +375,7 @@ IceInternal::TcpEndpointFactory::destroy() } EndpointFactoryPtr -IceInternal::TcpEndpointFactory::clone(const ProtocolInstancePtr& instance) const +IceInternal::TcpEndpointFactory::clone(const ProtocolInstancePtr& instance, const EndpointFactoryPtr&) const { return new TcpEndpointFactory(instance); } |