diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-02-11 16:07:16 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-02-11 16:07:16 +0100 |
| commit | 0a52973ce569827357cfa9ac0a2e96c09ffbf7cc (patch) | |
| tree | f219b25bebeca4f1e9e58e7174fe7870675b6246 /cpp/src/Ice/winrt/StreamEndpointI.cpp | |
| parent | Add Makefile.mak rule to register assemblies in source dir. (diff) | |
| download | ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.bz2 ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.xz ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.zip | |
Fixed ICE-5215: IPv6 support enabled by default
Diffstat (limited to 'cpp/src/Ice/winrt/StreamEndpointI.cpp')
| -rw-r--r-- | cpp/src/Ice/winrt/StreamEndpointI.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/Ice/winrt/StreamEndpointI.cpp b/cpp/src/Ice/winrt/StreamEndpointI.cpp index 7af2e822d7d..239ec8fd505 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.cpp +++ b/cpp/src/Ice/winrt/StreamEndpointI.cpp @@ -394,21 +394,22 @@ IceInternal::StreamEndpointI::transceiver(EndpointIPtr& endp) const } vector<ConnectorPtr> -IceInternal::StreamEndpointI::connectors() const +IceInternal::StreamEndpointI::connectors(Ice::EndpointSelectionType selType) const { - return connectors(getAddresses(_host, _port, _instance->protocolSupport(), true)); + return connectors(getAddresses(_host, _port, _instance->protocolSupport(), selType, _instance->preferIPv6(), true)); } void -IceInternal::StreamEndpointI::connectors_async(const EndpointI_connectorsPtr& callback) const +IceInternal::StreamEndpointI::connectors_async(Ice::EndpointSelectionType selType, + const EndpointI_connectorsPtr& callback) const { - callback->connectors(connectors()); + callback->connectors(connectors(selType)); } AcceptorPtr IceInternal::StreamEndpointI::acceptor(EndpointIPtr& endp, const string&) const { - StreamAcceptor* p = new StreamAcceptor(_instance, _type, _host, _port, _instance->protocolSupport()); + StreamAcceptor* p = new StreamAcceptor(_instance, _type, _host, _port); endp = new StreamEndpointI(_instance, _type, _host, p->effectivePort(), _timeout, _connectionId, _compress); return p; } |