diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-06-01 13:21:36 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-06-01 13:21:36 +0000 |
| commit | db16245ff267740502ca7fc01c1cc415a8570225 (patch) | |
| tree | be351bae94e2072244f81f78585b51da73910753 /cpp/src/Ice/UdpTransceiver.cpp | |
| parent | Use getaddrinfo instead of gethostbyname on Unix (diff) | |
| download | ice-db16245ff267740502ca7fc01c1cc415a8570225.tar.bz2 ice-db16245ff267740502ca7fc01c1cc415a8570225.tar.xz ice-db16245ff267740502ca7fc01c1cc415a8570225.zip | |
Changed getHosts to getAddresses
Diffstat (limited to 'cpp/src/Ice/UdpTransceiver.cpp')
| -rw-r--r-- | cpp/src/Ice/UdpTransceiver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index 1fa3fb8e5eb..a14cf302810 100644 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -384,7 +384,7 @@ IceInternal::UdpTransceiver::effectivePort() const return ntohs(_addr.sin_port); } -IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const string& host, int port, +IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const struct sockaddr_in& addr, const string& mcastInterface, int mcastTtl) : _traceLevels(instance->traceLevels()), _logger(instance->initializationData().logger), @@ -392,14 +392,14 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s _incoming(false), _connect(true), _warn(instance->initializationData().properties->getPropertyAsInt("Ice.Warn.Datagrams") > 0), - _shutdownReadWrite(false) + _shutdownReadWrite(false), + _addr(addr) { try { _fd = createSocket(true); setBufSize(instance); setBlock(_fd, false); - getAddress(host, port, _addr); doConnect(_fd, _addr, -1); _connect = false; // We're connected now if(isMulticast(_addr)) @@ -407,7 +407,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s if(mcastInterface.length() > 0) { struct sockaddr_in addr; - getAddress(mcastInterface, port, addr); + getAddress(mcastInterface, ntohs(_addr.sin_port), addr); setMcastInterface(_fd, addr.sin_addr); } if(mcastTtl != -1) |