honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-23 05:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Network: Allow to specify sub interfaces (virtual) in network configuration, closes #1667.

Browse Source
This commit is contained in:
Shay Banon 2012-02-05 19:06:50 +02:00
parent 44a6040293
commit 437eda6b5b
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/elasticsearch/common/network/NetworkUtils.java
View File

@ -232,12 +232,21 @@ public abstract class NetworkUtils {
}
/**
* Returns all the available interfaces, including first level sub interfaces.
*/
public static List<NetworkInterface> getAllAvailableInterfaces() throws SocketException {
List<NetworkInterface> allInterfaces = new ArrayList<NetworkInterface>(10);
NetworkInterface intf;
for (Enumeration en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) {
intf = (NetworkInterface) en.nextElement();
allInterfaces.add(intf);
List<NetworkInterface> allInterfaces = new ArrayList<NetworkInterface>();
for (Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces(); interfaces.hasMoreElements(); ) {
NetworkInterface intf = interfaces.nextElement();
allInterfaces.add(interfaces.nextElement());
Enumeration<NetworkInterface> subInterfaces = intf.getSubInterfaces();
if (subInterfaces != null && subInterfaces.hasMoreElements()) {
while (subInterfaces.hasMoreElements()) {
allInterfaces.add(subInterfaces.nextElement());
}
}
}
return allInterfaces;
}

29
src/main/java/org/elasticsearch/monitor/network/NetworkService.java
View File

@ -57,11 +57,11 @@ public class NetworkService extends AbstractComponent {
if (logger.isDebugEnabled()) {
StringBuilder netDebug = new StringBuilder("net_info");
try {
Enumeration<NetworkInterface> enum_ = NetworkInterface.getNetworkInterfaces();
Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
String hostName = InetAddress.getLocalHost().getHostName();
netDebug.append("\nhost [").append(hostName).append("]\n");
while (enum_.hasMoreElements()) {
NetworkInterface net = enum_.nextElement();
while (interfaces.hasMoreElements()) {
NetworkInterface net = interfaces.nextElement();
netDebug.append(net.getName()).append('\t').append("display_name [").append(net.getDisplayName()).append("]\n");
Enumeration<InetAddress> addresses = net.getInetAddresses();
@ -73,9 +73,30 @@ public class NetworkService extends AbstractComponent {
netDebug.append("\t\tmtu [").append(net.getMTU()).append("] multicast [").append(net.supportsMulticast()).append("] ptp [").append(net.isPointToPoint())
.append("] loopback [").append(net.isLoopback()).append("] up [").append(net.isUp()).append("] virtual [").append(net.isVirtual()).append("]")
.append('\n');
Enumeration<NetworkInterface> subInterfaces = net.getSubInterfaces();
if (subInterfaces != null && subInterfaces.hasMoreElements()) {
netDebug.append("\t\t\tsub interfaces:\n");
while (subInterfaces.hasMoreElements()) {
net = subInterfaces.nextElement();
netDebug.append("\t\t\t").append(net.getName()).append("\t").append("display_name [").append(net.getDisplayName()).append("]\n");
addresses = net.getInetAddresses();
netDebug.append("\t\t\t\t\taddress ");
while (addresses.hasMoreElements()) {
netDebug.append("[").append(addresses.nextElement()).append("] ");
}
netDebug.append('\n');
netDebug.append("\t\t\t\t\tmtu [").append(net.getMTU()).append("] multicast [").append(net.supportsMulticast()).append("] ptp [").append(net.isPointToPoint())
.append("] loopback [").append(net.isLoopback()).append("] up [").append(net.isUp()).append("] virtual [").append(net.isVirtual()).append("]")
.append('\n');
}
}
}
} catch (Exception ex) {
netDebug.append("Failed to get Network Interface Info [" + ex.getMessage() + "]");
netDebug.append("failed to get Network Interface Info [" + ex.getMessage() + "]");
}
logger.debug(netDebug.toString());
}