2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-03 00:37:55 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge pull request #8 from matt123337/patch-2

Browse Source 
Update NetworkInterface.java
This commit is contained in:
Jeroen Ketelaar
2014-08-15 13:43:30 +02:00
parent 69d0e80b4a 13fcfd3a98
commit 8beed569f9
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parabotv2/src/org/parabot/core/network/NetworkInterface.java
+10 -16
View File
@@ -10,29 +10,23 @@ public class NetworkInterface {
private static NetworkInterface cached;
static {
try {
mac = getRealHardwareAddress();
} catch (Exception ignored) {
}
try {
mac = getRealHardwareAddress();
} catch (SocketException ignored) {
}
}
public byte[] getHardwareAddress() {
return mac;
}
public static byte[] getRealHardwareAddress() throws SocketException {
public static byte[] getRealHardwareAddress() throws SocketException{
if (realMac != null)
return realMac;
Enumeration<java.net.NetworkInterface> nis = java.net.NetworkInterface
.getNetworkInterfaces();
while (nis.hasMoreElements()) {
try {
byte[] b = nis.nextElement().getHardwareAddress();
if (b.length == 0)
continue;
return realMac = b;
} catch (Exception e) {
}
try {
return realMac = java.net.NetworkInterface.getByInetAddress(
InetAddress.getLocalHost()).getHardwareAddress();
} catch (Exception e) {
}
return mac;
}
@@ -42,4 +36,4 @@ public class NetworkInterface {
cached = new NetworkInterface();
return cached;
}
}
}