moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-20 19:42:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug with MAC address selection that caused it to always select the first adapter

Browse Source
This commit is contained in:
Cameron Gutman 2013-11-14 17:30:40 -05:00
parent 690df6e42c
commit 79db2ed584
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/limelight/nvstream/NvConnection.java
View File

@ -49,7 +49,8 @@ public class NvConnection {
while (selectedIface == null && ifaceList.hasMoreElements()) { while (selectedIface == null && ifaceList.hasMoreElements()) {
NetworkInterface iface = ifaceList.nextElement(); NetworkInterface iface = ifaceList.nextElement();
if (iface.getName().startsWith("wlan")) { if (iface.getName().startsWith("wlan") &&
iface.getHardwareAddress() != null) {
selectedIface = iface; selectedIface = iface;
} }
} }
@ -59,15 +60,21 @@ public class NvConnection {
while (selectedIface == null && ifaceList.hasMoreElements()) { while (selectedIface == null && ifaceList.hasMoreElements()) {
NetworkInterface iface = ifaceList.nextElement(); NetworkInterface iface = ifaceList.nextElement();
if (iface.getName().startsWith("eth")) { if (iface.getName().startsWith("eth") &&
iface.getHardwareAddress() != null) {
selectedIface = iface; selectedIface = iface;
} }
} }
// Now just find something // Now just find something with a MAC address
ifaceList = NetworkInterface.getNetworkInterfaces(); ifaceList = NetworkInterface.getNetworkInterfaces();
if (ifaceList.hasMoreElements()) { while (selectedIface == null && ifaceList.hasMoreElements()) {
NetworkInterface iface = ifaceList.nextElement();
if (iface.getHardwareAddress() != null) {
selectedIface = ifaceList.nextElement(); selectedIface = ifaceList.nextElement();
break;
}
} }
if (selectedIface == null) { if (selectedIface == null) {
@ -75,7 +82,7 @@ public class NvConnection {
} }
byte[] macAddress = selectedIface.getHardwareAddress(); byte[] macAddress = selectedIface.getHardwareAddress();
if (macAddress != null && macAddress.length == 6) { if (macAddress != null) {
StringBuilder addrStr = new StringBuilder(); StringBuilder addrStr = new StringBuilder();
for (int i = 0; i < macAddress.length; i++) { for (int i = 0; i < macAddress.length; i++) {
addrStr.append(String.format("%02x", macAddress[i])); addrStr.append(String.format("%02x", macAddress[i]));