honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Network Settings: Allow to explicitly set ipv4 and ipv4 when using _networkInterface_ notation, closes #841.

This commit is contained in:
kimchy 2011-04-07 20:01:52 +03:00
parent 1fdef91fc2
commit ca01dc7a09
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/elasticsearch/src/main/java/org/elasticsearch/common/network/NetworkService.java
View File

@ -114,6 +114,7 @@ public class NetworkService extends AbstractComponent {
if (host == null) { if (host == null) {
return null; return null;
} }
String origHost = host;
if ((host.startsWith("#") && host.endsWith("#")) || (host.startsWith("_") && host.endsWith("_"))) { if ((host.startsWith("#") && host.endsWith("#")) || (host.startsWith("_") && host.endsWith("_"))) {
host = host.substring(1, host.length() - 1); host = host.substring(1, host.length() - 1);
@ -133,17 +134,25 @@ public class NetworkService extends AbstractComponent {
return NetworkUtils.getFirstNonLoopbackAddress(NetworkUtils.getIpStackType()); return NetworkUtils.getFirstNonLoopbackAddress(NetworkUtils.getIpStackType());
} }
} else { } else {
NetworkUtils.StackType stackType = NetworkUtils.getIpStackType();
if (host.toLowerCase().endsWith(":ipv4")) {
stackType = NetworkUtils.StackType.IPv4;
host = host.substring(0, host.length() - 5);
} else if (host.toLowerCase().endsWith(":ipv6")) {
stackType = NetworkUtils.StackType.IPv6;
host = host.substring(0, host.length() - 5);
}
Collection<NetworkInterface> allInterfs = NetworkUtils.getAllAvailableInterfaces(); Collection<NetworkInterface> allInterfs = NetworkUtils.getAllAvailableInterfaces();
for (NetworkInterface ni : allInterfs) { for (NetworkInterface ni : allInterfs) {
if (!ni.isUp() || ni.isLoopback()) { if (!ni.isUp() || ni.isLoopback()) {
continue; continue;
} }
if (host.equals(ni.getName()) || host.equals(ni.getDisplayName())) { if (host.equals(ni.getName()) || host.equals(ni.getDisplayName())) {
return NetworkUtils.getFirstNonLoopbackAddress(ni, NetworkUtils.getIpStackType()); return NetworkUtils.getFirstNonLoopbackAddress(ni, stackType);
} }
} }
} }
throw new IOException("Failed to find network interface for [" + host + "]"); throw new IOException("Failed to find network interface for [" + origHost + "]");
} }
return InetAddress.getByName(host); return InetAddress.getByName(host);
} }