moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 03:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve mDNS for multi-homed systems

Browse Source
This commit is contained in:
Cameron Gutman 2016-05-29 16:04:55 -05:00
parent 439afd15fa
commit b5e89e47b6
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
moonlight-common/src/com/limelight/nvstream/mdns/MdnsDiscoveryAgent.java
View File

@ -106,41 +106,32 @@ public class MdnsDiscoveryAgent implements ServiceListener {
} }
private void handleResolvedServiceInfo(ServiceInfo info) { private void handleResolvedServiceInfo(ServiceInfo info) {
MdnsComputer computer;
pendingResolution.remove(info.getName()); pendingResolution.remove(info.getName());
try { try {
computer = parseServerInfo(info); handleServiceInfo(info);
if (computer == null) {
LimeLog.info("mDNS: Invalid response for machine: "+info.getName());
return;
}
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Invalid DNS response // Invalid DNS response
LimeLog.info("mDNS: Invalid response for machine: "+info.getName()); LimeLog.info("mDNS: Invalid response for machine: "+info.getName());
return; return;
} }
}
private void handleServiceInfo(ServiceInfo info) throws UnsupportedEncodingException {
Inet4Address addrs[] = info.getInet4Addresses();
LimeLog.info("mDNS: "+info.getName()+" has "+addrs.length+" addresses");
// Add a computer object for each IPv4 address reported by the PC
for (Inet4Address addr : addrs) {
synchronized (computers) { synchronized (computers) {
MdnsComputer computer = new MdnsComputer(info.getName(), addr);
if (computers.put(computer.getAddress(), computer) == null) { if (computers.put(computer.getAddress(), computer) == null) {
// This was a new entry // This was a new entry
listener.notifyComputerAdded(computer); listener.notifyComputerAdded(computer);
} }
} }
} }
private static MdnsComputer parseServerInfo(ServiceInfo info) throws UnsupportedEncodingException {
Inet4Address addrs[] = info.getInet4Addresses();
if (addrs.length == 0) {
LimeLog.info("mDNS: "+info.getName()+" is missing addresses");
return null;
}
Inet4Address address = addrs[0];
String name = info.getName();
return new MdnsComputer(name, address);
} }
public void startDiscovery(final int discoveryIntervalMs) { public void startDiscovery(final int discoveryIntervalMs) {
@ -171,7 +162,9 @@ public class MdnsDiscoveryAgent implements ServiceListener {
ServiceInfo[] infos = resolver.getServiceInfos(SERVICE_TYPE, name, 500); ServiceInfo[] infos = resolver.getServiceInfos(SERVICE_TYPE, name, 500);
if (infos != null && infos.length != 0) { if (infos != null && infos.length != 0) {
LimeLog.info("mDNS: Resolved (retry) with "+infos.length+" service entries"); LimeLog.info("mDNS: Resolved (retry) with "+infos.length+" service entries");
handleResolvedServiceInfo(infos[0]); for (ServiceInfo svcinfo : infos) {
handleResolvedServiceInfo(svcinfo);
}
} }
} }