dorkbox/Utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added extra support to ip discovery

Browse Source
This commit is contained in:
nathan 2015-06-29 01:42:59 +02:00
parent 3c7834c62a
commit 97abebdc16
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Dorkbox-Util/src/dorkbox/util/Sys.java
View File

@ -15,32 +15,16 @@
*/ */
package dorkbox.util; package dorkbox.util;
import java.io.BufferedReader; import org.bouncycastle.crypto.digests.SHA256Digest;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.*;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.net.Inet4Address; import java.net.*;
import java.net.InetAddress; import java.util.*;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.URL;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.bouncycastle.crypto.digests.SHA256Digest;
public class Sys { public class Sys {
public static final int javaVersion = getJavaVersion(); public static final int javaVersion = getJavaVersion();
public static final boolean isAndroid = getIsAndroid(); public static final boolean isAndroid = getIsAndroid();
@ -798,10 +782,11 @@ public class Sys {
// it didn't work with ethX, so try emX! // it didn't work with ethX, so try emX!
while (nets.hasMoreElements()) { while (nets.hasMoreElements()) {
nets = NetworkInterface.getNetworkInterfaces();
NetworkInterface nextElement = nets.nextElement(); NetworkInterface nextElement = nets.nextElement();
String name = nextElement.getName(); String name = nextElement.getName();
// we only want to use wlanX addresses! // we only want to use emX addresses!
if (name.startsWith("em")) { if (name.startsWith("em")) {
Enumeration<InetAddress> inetAddresses = nextElement.getInetAddresses(); Enumeration<InetAddress> inetAddresses = nextElement.getInetAddresses();
@ -815,8 +800,29 @@ public class Sys {
} }
} }
// it didn't work with emX, so try enX!
while (nets.hasMoreElements()) {
nets = NetworkInterface.getNetworkInterfaces();
NetworkInterface nextElement = nets.nextElement();
String name = nextElement.getName();
// we only want to use enX addresses!
if (name.startsWith("en")) {
Enumeration<InetAddress> inetAddresses = nextElement.getInetAddresses();
while (inetAddresses.hasMoreElements()) {
InetAddress address = inetAddresses.nextElement();
// we only support IPV4 addresses.
if (!address.isLoopbackAddress() && address instanceof Inet4Address) {
return address;
}
}
}
}
// it didn't work with ethX, so try wifi! // it didn't work with ethX, so try wifi!
while (nets.hasMoreElements()) { while (nets.hasMoreElements()) {
nets = NetworkInterface.getNetworkInterfaces();
NetworkInterface nextElement = nets.nextElement(); NetworkInterface nextElement = nets.nextElement();
String name = nextElement.getName(); String name = nextElement.getName();