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) --- cpp/src/Ice/Network.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cpp/src') diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 09508a02737..b97c8834bcf 100755 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -1686,6 +1686,11 @@ IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport proto hosts.push_back(inetAddrToString(*p)); } } + if(hosts.empty() && !includeLoopback) + { + // Return loopback if only loopback is available no other local addresses are available. + return getHostsForEndpointExpand(host, protocolSupport, true); + } } return hosts; // An empty host list indicates to just use the given host. } -- 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 'cpp/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 From 0272bd6a34f3b01528e21e1682f1be4387c5f023 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Wed, 7 Feb 2018 15:03:49 +0100 Subject: Fixed Glacier2 potential NullHandleException (ICE-8575) --- cpp/src/Glacier2/SessionRouterI.cpp | 7 ++++++- cpp/test/Glacier2/router/Client.cpp | 13 +++++++++++++ csharp/test/Glacier2/router/Client.cs | 13 +++++++++++++ .../test/src/main/java/test/Glacier2/router/Client.java | 14 ++++++++++++++ java/test/src/main/java/test/Glacier2/router/Client.java | 14 ++++++++++++++ js/test/Glacier2/router/Client.js | 13 +++++++++++++ 6 files changed, 73 insertions(+), 1 deletion(-) (limited to 'cpp/src') diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp index e485f76c921..d97f55bcde0 100644 --- a/cpp/src/Glacier2/SessionRouterI.cpp +++ b/cpp/src/Glacier2/SessionRouterI.cpp @@ -1125,7 +1125,12 @@ SessionRouterI::expireSessions() RouterIPtr SessionRouterI::getRouterImpl(const ConnectionPtr& connection, const Ice::Identity& id, bool close) const { - if(_destroy) + // + // The connection can be null if the client tries to forward requests to + // a proxy which points to the client endpoints (in which case the request + // is forwarded with collocation optimization). + // + if(_destroy || !connection) { throw ObjectNotExistException(__FILE__, __LINE__); } diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp index 778e02ea4ea..afa70d92013 100644 --- a/cpp/test/Glacier2/router/Client.cpp +++ b/cpp/test/Glacier2/router/Client.cpp @@ -554,6 +554,19 @@ CallbackClient::run(int argc, char* argv[]) cout << "ok" << endl; } + { + cout << "pinging object with client endpoint... " << flush; + Ice::ObjectPrx baseC = communicator()->stringToProxy("collocated:" + getTestEndpoint(communicator(), 50)); + try + { + baseC->ice_ping(); + } + catch(const Ice::ObjectNotExistException&) + { + } + cout << "ok" << endl; + } + CallbackPrx twoway; { diff --git a/csharp/test/Glacier2/router/Client.cs b/csharp/test/Glacier2/router/Client.cs index a996bb0275a..795aaeb730a 100644 --- a/csharp/test/Glacier2/router/Client.cs +++ b/csharp/test/Glacier2/router/Client.cs @@ -165,6 +165,19 @@ public class Client : TestCommon.Application Console.Out.WriteLine("ok"); } + { + Console.Out.Write("pinging object with client endpoint... "); + Ice.ObjectPrx baseC = communicator().stringToProxy("collocated:" + getTestEndpoint(50)); + try + { + baseC.ice_ping(); + } + catch(Ice.ObjectNotExistException) + { + } + Console.Out.WriteLine("ok"); + } + CallbackPrx twoway; { diff --git a/java-compat/test/src/main/java/test/Glacier2/router/Client.java b/java-compat/test/src/main/java/test/Glacier2/router/Client.java index 7d932ab0465..15bd713e670 100644 --- a/java-compat/test/src/main/java/test/Glacier2/router/Client.java +++ b/java-compat/test/src/main/java/test/Glacier2/router/Client.java @@ -189,6 +189,20 @@ public class Client extends test.Util.Application out.println("ok"); } + { + out.print("pinging object with client endpoint... "); + out.flush(); + Ice.ObjectPrx baseC = communicator().stringToProxy("collocated:" + getTestEndpoint(50)); + try + { + baseC.ice_ping(); + } + catch(Ice.ObjectNotExistException ex) + { + } + out.println("ok"); + } + CallbackPrx twoway; { diff --git a/java/test/src/main/java/test/Glacier2/router/Client.java b/java/test/src/main/java/test/Glacier2/router/Client.java index a083c860c3b..0ffbeabee2c 100644 --- a/java/test/src/main/java/test/Glacier2/router/Client.java +++ b/java/test/src/main/java/test/Glacier2/router/Client.java @@ -186,6 +186,20 @@ public class Client extends test.Util.Application out.println("ok"); } + { + out.print("pinging object with client endpoint... "); + out.flush(); + com.zeroc.Ice.ObjectPrx baseC = communicator().stringToProxy("collocated:" + getTestEndpoint(50)); + try + { + baseC.ice_ping(); + } + catch(com.zeroc.Ice.ObjectNotExistException ex) + { + } + out.println("ok"); + } + CallbackPrx twoway; { diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js index 76db6a620db..9ea97bf1ec5 100644 --- a/js/test/Glacier2/router/Client.js +++ b/js/test/Glacier2/router/Client.js @@ -141,6 +141,19 @@ await base.ice_ping(); out.writeLine("ok"); + { + out.write("pinging object with client endpoint... "); + const baseC = communicator.stringToProxy("collocated:default -p 12060"); + try + { + await baseC.ice_ping(); + } + catch(ex) + { + } + out.writeLine("ok"); + } + out.write("testing checked cast for server object... "); let twoway = await Test.CallbackPrx.checkedCast(base); test(twoway !== null); -- cgit v1.2.3