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/IPEndpointI.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/IPEndpointI.cpp')
| -rw-r--r-- | cpp/src/Ice/IPEndpointI.cpp | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index 824864a7588..21f4def1c2d 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -106,11 +106,10 @@ IceInternal::IPEndpointI::secure() const } void -IceInternal::IPEndpointI::streamWrite(OutputStream* s) const +IceInternal::IPEndpointI::streamWriteImpl(OutputStream* s) const { - s->startEncapsulation(); - streamWriteImpl(s); - s->endEncapsulation(); + s->write(_host, false); + s->write(_port); } const string& @@ -132,18 +131,6 @@ IceInternal::IPEndpointI::connectionId(const string& connectionId) const } } -const std::string& -IceInternal::IPEndpointI::host() const -{ - return _host; -} - -int -IceInternal::IPEndpointI::port() const -{ - return _port; -} - void IceInternal::IPEndpointI::connectors_async(Ice::EndpointSelectionType selType, const EndpointI_connectorsPtr& cb) const { @@ -355,13 +342,6 @@ IceInternal::IPEndpointI::connectors(const vector<Address>& addresses, const Net } void -IceInternal::IPEndpointI::streamWriteImpl(OutputStream* s) const -{ - s->write(_host, false); - s->write(_port); -} - -void IceInternal::IPEndpointI::hashInit(Ice::Int& h) const { hashAdd(h, _host); |