diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-26 08:32:15 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-26 08:32:15 +0100 |
| commit | 655ce0efca250a8103e51883f1b7dd34a9a0df4f (patch) | |
| tree | 8dedf5435f225517b9c49ce52de0835fed803aee /cpp/src/Ice/Network.cpp | |
| parent | First cut of ICE-6920 - Remove try/catch block around communicator destroy (diff) | |
| download | ice-655ce0efca250a8103e51883f1b7dd34a9a0df4f.tar.bz2 ice-655ce0efca250a8103e51883f1b7dd34a9a0df4f.tar.xz ice-655ce0efca250a8103e51883f1b7dd34a9a0df4f.zip | |
Fixed ICE-7496 - Ice/binding too slow, speed up of tests on Windows
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rwxr-xr-x | cpp/src/Ice/Network.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index eebf5ae1c00..3f75d0f9270 100755 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -1664,13 +1664,13 @@ IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport proto } vector<string> -IceInternal::getInterfacesForMulticast(const string& interface, const Address& mcastAddr) +IceInternal::getInterfacesForMulticast(const string& intf, const Address& mcastAddr) { - int protocolSupport = getProtocolSupport(mcastAddr); - vector<string> interfaces = getHostsForEndpointExpand(interface, protocolSupport, true); + ProtocolSupport protocolSupport = getProtocolSupport(mcastAddr); + vector<string> interfaces = getHostsForEndpointExpand(intf, protocolSupport, true); if(interfaces.empty()) { - interfaces.push_back(interface); + interfaces.push_back(intf); } return interfaces; } @@ -1700,12 +1700,12 @@ IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport proto } vector<string> -IceInternal::getInterfacesForMulticast(const string& interface, const Address& mcastAddr) +IceInternal::getInterfacesForMulticast(const string& intf, const Address& mcastAddr) { ProtocolSupport protocolSupport = getProtocolSupport(mcastAddr); vector<string> interfaces; bool ipv4Wildcard = false; - if(isWildcard(interface, protocolSupport, ipv4Wildcard)) + if(isWildcard(intf, protocolSupport, ipv4Wildcard)) { vector<Address> addrs = getLocalAddresses(ipv4Wildcard ? EnableIPv4 : protocolSupport, true); for(vector<Address>::const_iterator p = addrs.begin(); p != addrs.end(); ++p) @@ -1715,7 +1715,7 @@ IceInternal::getInterfacesForMulticast(const string& interface, const Address& m } if(interfaces.empty()) { - interfaces.push_back(interface); + interfaces.push_back(intf); } return interfaces; } @@ -2104,7 +2104,7 @@ IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string& intf) } #else void -IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string&, int) +IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string&) { try { |