diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-12-21 15:25:37 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-12-21 15:25:37 -0500 |
| commit | e099cd4fd77c718f9c241ad609f5aa7a80627ba8 (patch) | |
| tree | 998305e426f74429b00122dcdc4f839e2f97ade5 /cpp/src/IceSSL/ConnectorI.cpp | |
| parent | IceUtil cleanup (first commit) (diff) | |
| parent | Fix bug 2520: Test suite unsets ICE_CONFIG to avoid configuration conflicts (diff) | |
| download | ice-e099cd4fd77c718f9c241ad609f5aa7a80627ba8.tar.bz2 ice-e099cd4fd77c718f9c241ad609f5aa7a80627ba8.tar.xz ice-e099cd4fd77c718f9c241ad609f5aa7a80627ba8.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Conflicts:
cpp/src/Slice/VbUtil.cpp
Diffstat (limited to 'cpp/src/IceSSL/ConnectorI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/ConnectorI.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp index feb4c4b4e89..31f2c176e15 100644 --- a/cpp/src/IceSSL/ConnectorI.cpp +++ b/cpp/src/IceSSL/ConnectorI.cpp @@ -40,7 +40,7 @@ IceSSL::ConnectorI::connect(int timeout) out << "trying to establish ssl connection to " << toString(); } - SOCKET fd = IceInternal::createSocket(false); + SOCKET fd = IceInternal::createSocket(false, _addr.ss_family); IceInternal::setBlock(fd, false); IceInternal::setTcpBufSize(fd, _instance->communicator()->getProperties(), _logger); bool connected = IceInternal::doConnect(fd, _addr, timeout); @@ -147,10 +147,9 @@ IceSSL::ConnectorI::operator<(const IceInternal::Connector& r) const return IceInternal::compareAddress(_addr, p->_addr) == -1; } -IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const struct sockaddr_in& addr, Ice::Int timeout, +IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const struct sockaddr_storage& addr, Ice::Int timeout, const string& connectionId) : _instance(instance), - _host(IceInternal::inetAddrToString(addr.sin_addr)), _logger(instance->communicator()->getLogger()), _addr(addr), _timeout(timeout), |