From 0a52973ce569827357cfa9ac0a2e96c09ffbf7cc Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Mon, 11 Feb 2013 16:07:16 +0100 Subject: Fixed ICE-5215: IPv6 support enabled by default --- cpp/src/Ice/TcpEndpointI.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'cpp/src/Ice/TcpEndpointI.cpp') diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp index f69cfb1094b..9e45a2a62fd 100644 --- a/cpp/src/Ice/TcpEndpointI.cpp +++ b/cpp/src/Ice/TcpEndpointI.cpp @@ -363,22 +363,21 @@ IceInternal::TcpEndpointI::transceiver(EndpointIPtr& endp) const } vector -IceInternal::TcpEndpointI::connectors() const +IceInternal::TcpEndpointI::connectors(EndpointSelectionType selType) const { - return _instance->endpointHostResolver()->resolve(_host, _port, const_cast(this)); + return _instance->endpointHostResolver()->resolve(_host, _port, selType, const_cast(this)); } void -IceInternal::TcpEndpointI::connectors_async(const EndpointI_connectorsPtr& callback) const +IceInternal::TcpEndpointI::connectors_async(EndpointSelectionType selType, const EndpointI_connectorsPtr& cb) const { - _instance->endpointHostResolver()->resolve(_host, _port, const_cast(this), callback); + _instance->endpointHostResolver()->resolve(_host, _port, selType, const_cast(this), cb); } AcceptorPtr IceInternal::TcpEndpointI::acceptor(EndpointIPtr& endp, const string&) const { - TcpAcceptor* p = new TcpAcceptor(_instance, _host, _port, _instance->protocolSupport()); - + TcpAcceptor* p = new TcpAcceptor(_instance, _host, _port); endp = new TcpEndpointI(_instance, _host, p->effectivePort(), _timeout, _connectionId, _compress); return p; } -- cgit v1.2.3