From 08179f1bfd7b900ca086985c0034ed9c98f71df0 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Tue, 6 Feb 2018 15:32:56 +0100 Subject: Added loopback addresses to published endpoints if no other adresses are available (ICE-8622) --- csharp/src/Ice/Network.cs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'csharp/src') diff --git a/csharp/src/Ice/Network.cs b/csharp/src/Ice/Network.cs index 59f88fa3e17..247b88b0405 100644 --- a/csharp/src/Ice/Network.cs +++ b/csharp/src/Ice/Network.cs @@ -950,6 +950,11 @@ namespace IceInternal hosts.Add(a.ToString()); } } + if(hosts.Count == 0 && !includeLoopback) + { + // Return loopback if only loopback is available no other local addresses are available. + return getHostsForEndpointExpand(host, protocol, true); + } } return hosts; } -- cgit v1.2.3 From ec19831c2f76305ee8e259ac0469d615f14b5c3b Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Wed, 7 Feb 2018 09:51:18 +0100 Subject: Better fix for publishing loopback addresses when no other addresses are available (ICE-8622) --- cpp/src/Ice/Network.cpp | 65 ++++++++++++++-------- csharp/src/Ice/Network.cs | 43 ++++++++++---- .../src/Ice/src/main/java/IceInternal/Network.java | 23 +++----- .../main/java/com/zeroc/IceInternal/Network.java | 23 +++----- 4 files changed, 91 insertions(+), 63 deletions(-) (limited to 'csharp/src') diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index b97c8834bcf..9b1b186d56d 100755 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -780,6 +780,35 @@ getAddressStorageSize(const Address& addr) return size; } +vector
+getLoopbackAddresses(ProtocolSupport protocol, int port = 0) +{ + vector
result; + + Address addr; + memset(&addr.saStorage, 0, sizeof(sockaddr_storage)); + + // + // We don't use getaddrinfo when host is empty as it's not portable (some old Linux + // versions don't support it). + // + if(protocol != EnableIPv4) + { + addr.saIn6.sin6_family = AF_INET6; + addr.saIn6.sin6_port = htons(port); + addr.saIn6.sin6_addr = in6addr_loopback; + result.push_back(addr); + } + if(protocol != EnableIPv6) + { + addr.saIn.sin_family = AF_INET; + addr.saIn.sin_port = htons(port); + addr.saIn.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + result.push_back(addr); + } + return result; +} + #endif // #ifndef ICE_OS_UWP } @@ -1055,9 +1084,6 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol bool preferIPv6, bool canBlock) { vector
result; - Address addr; - - memset(&addr.saStorage, 0, sizeof(sockaddr_storage)); // // We don't use getaddrinfo when host is empty as it's not portable (some old Linux @@ -1065,24 +1091,14 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol // if(host.empty()) { - if(protocol != EnableIPv4) - { - addr.saIn6.sin6_family = AF_INET6; - addr.saIn6.sin6_port = htons(port); - addr.saIn6.sin6_addr = in6addr_loopback; - result.push_back(addr); - } - if(protocol != EnableIPv6) - { - addr.saIn.sin_family = AF_INET; - addr.saIn.sin_port = htons(port); - addr.saIn.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - result.push_back(addr); - } + result = getLoopbackAddresses(protocol, port); sortAddresses(result, protocol, selType, preferIPv6); return result; } + Address addr; + memset(&addr.saStorage, 0, sizeof(sockaddr_storage)); + struct addrinfo* info = 0; int retry = 5; @@ -1218,7 +1234,8 @@ IceInternal::getAddressForServer(const string& host, int port, ProtocolSupport p #endif return addr; } - vector
addrs = getAddresses(host, port, protocol, Ice::ICE_ENUM(EndpointSelectionType, Ordered), preferIPv6, canBlock); + vector
addrs = getAddresses(host, port, protocol, Ice::ICE_ENUM(EndpointSelectionType, Ordered), + preferIPv6, canBlock); return addrs.empty() ? Address() : addrs[0]; } @@ -1640,7 +1657,7 @@ IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport proto hosts.push_back(wstringToString(h->CanonicalName->Data(), getProcessStringConverter())); } } - if(includeLoopback) + if(hosts.empty() || includeLoopback) { if(protocolSupport != EnableIPv6) { @@ -1686,10 +1703,14 @@ IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport proto hosts.push_back(inetAddrToString(*p)); } } - if(hosts.empty() && !includeLoopback) + if(hosts.empty()) { - // Return loopback if only loopback is available no other local addresses are available. - return getHostsForEndpointExpand(host, protocolSupport, true); + // Return loopback if no other local addresses are available. + addrs = getLoopbackAddresses(protocolSupport); + for(vector
::const_iterator p = addrs.begin(); p != addrs.end(); ++p) + { + hosts.push_back(inetAddrToString(*p)); + } } } return hosts; // An empty host list indicates to just use the given host. diff --git a/csharp/src/Ice/Network.cs b/csharp/src/Ice/Network.cs index 247b88b0405..0cb2c29d14d 100644 --- a/csharp/src/Ice/Network.cs +++ b/csharp/src/Ice/Network.cs @@ -713,14 +713,20 @@ namespace IceInternal List addresses = new List(); if(host.Length == 0) { - if(protocol != EnableIPv4) + foreach(IPAddress a in getLoopbackAddresses(protocol)) { - addresses.Add(new IPEndPoint(IPAddress.IPv6Loopback, port)); + addresses.Add(new IPEndPoint(a, port)); } - - if(protocol != EnableIPv6) + if(protocol == EnableBoth) { - addresses.Add(new IPEndPoint(IPAddress.Loopback, port)); + if(preferIPv6) + { + IceUtilInternal.Collections.Sort(ref addresses, _preferIPv6Comparator); + } + else + { + IceUtilInternal.Collections.Sort(ref addresses, _preferIPv4Comparator); + } } return addresses; } @@ -942,18 +948,20 @@ namespace IceInternal bool ipv4Wildcard = false; if(isWildcard(host, out ipv4Wildcard)) { - IPAddress[] addrs = getLocalAddresses(ipv4Wildcard ? EnableIPv4 : protocol, includeLoopback); - foreach(IPAddress a in addrs) + foreach(IPAddress a in getLocalAddresses(ipv4Wildcard ? EnableIPv4 : protocol, includeLoopback)) { if(!isLinklocal(a)) { hosts.Add(a.ToString()); } } - if(hosts.Count == 0 && !includeLoopback) + if(hosts.Count == 0) { // Return loopback if only loopback is available no other local addresses are available. - return getHostsForEndpointExpand(host, protocol, true); + foreach(IPAddress a in getLoopbackAddresses(protocol)) + { + hosts.Add(a.ToString()); + } } } return hosts; @@ -965,8 +973,7 @@ namespace IceInternal bool ipv4Wildcard = false; if(isWildcard(intf, out ipv4Wildcard)) { - IPAddress[] addrs = getLocalAddresses(ipv4Wildcard ? EnableIPv4 : protocol, true); - foreach(IPAddress a in addrs) + foreach(IPAddress a in getLocalAddresses(ipv4Wildcard ? EnableIPv4 : protocol, true)) { interfaces.Add(a.ToString()); } @@ -1219,6 +1226,20 @@ namespace IceInternal return false; } + public static List getLoopbackAddresses(int protocol) + { + List addresses = new List(); + if(protocol != EnableIPv4) + { + addresses.Add(IPAddress.IPv6Loopback); + } + if(protocol != EnableIPv6) + { + addresses.Add(IPAddress.Loopback); + } + return addresses; + } + public static bool addressEquals(EndPoint addr1, EndPoint addr2) { diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Network.java b/java-compat/src/Ice/src/main/java/IceInternal/Network.java index 62fff1554b8..a58df9bcf5c 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Network.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Network.java @@ -1047,8 +1047,7 @@ public final class Network java.util.ArrayList hosts = new java.util.ArrayList(); if(isWildcard(host)) { - java.util.ArrayList addrs = getLocalAddresses(protocolSupport, includeLoopback); - for(java.net.InetAddress addr : addrs) + for(java.net.InetAddress addr : getLocalAddresses(protocolSupport, includeLoopback)) { // // NOTE: We don't publish link-local IPv6 addresses as these addresses can only @@ -1059,10 +1058,13 @@ public final class Network hosts.add(addr.getHostAddress()); } } - if(hosts.isEmpty() && !includeLoopback) + if(hosts.isEmpty()) { - // Return loopback if only loopback is available no other local addresses are available. - return getHostsForEndpointExpand(host, protocolSupport, true); + // Return loopback if no other local addresses are available. + for(java.net.InetAddress addr : getLoopbackAddresses(protocolSupport)) + { + hosts.add(addr.getHostAddress()); + } } } return hosts; @@ -1074,19 +1076,10 @@ public final class Network java.util.ArrayList interfaces = new java.util.ArrayList<>(); if(isWildcard(intf)) { - java.util.ArrayList addrs = getLocalAddresses(protocolSupport, true); - for(java.net.InetAddress addr : addrs) + for(java.net.InetAddress addr : getLocalAddresses(protocolSupport, true)) { interfaces.add(addr.getHostAddress()); } - if(protocolSupport != EnableIPv6) - { - interfaces.add("127.0.0.1"); - } - if(protocolSupport != EnableIPv4) - { - interfaces.add("0:0:0:0:0:0:0:1"); - } } if(interfaces.isEmpty()) { diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Network.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Network.java index d9469220608..0a66898acf5 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Network.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Network.java @@ -1052,8 +1052,7 @@ public final class Network java.util.ArrayList hosts = new java.util.ArrayList<>(); if(isWildcard(host)) { - java.util.ArrayList addrs = getLocalAddresses(protocolSupport, includeLoopback); - for(java.net.InetAddress addr : addrs) + for(java.net.InetAddress addr : getLocalAddresses(protocolSupport, includeLoopback)) { // // NOTE: We don't publish link-local IPv6 addresses as these addresses can only @@ -1064,10 +1063,13 @@ public final class Network hosts.add(addr.getHostAddress()); } } - if(hosts.isEmpty() && !includeLoopback) + if(hosts.isEmpty()) { - // Return loopback if only loopback is available no other local addresses are available. - return getHostsForEndpointExpand(host, protocolSupport, true); + // Return loopback if no other local addresses are available. + for(java.net.InetAddress addr : getLoopbackAddresses(protocolSupport)) + { + hosts.add(addr.getHostAddress()); + } } } return hosts; @@ -1079,19 +1081,10 @@ public final class Network java.util.ArrayList interfaces = new java.util.ArrayList<>(); if(isWildcard(intf)) { - java.util.ArrayList addrs = getLocalAddresses(protocolSupport, true); - for(java.net.InetAddress addr : addrs) + for(java.net.InetAddress addr : getLocalAddresses(protocolSupport, true)) { interfaces.add(addr.getHostAddress()); } - if(protocolSupport != EnableIPv6) - { - interfaces.add("127.0.0.1"); - } - if(protocolSupport != EnableIPv4) - { - interfaces.add("0:0:0:0:0:0:0:1"); - } } if(interfaces.isEmpty()) { -- cgit v1.2.3