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

Fix PC duplication issue when multiple machines report the same remote IP address

Browse Source
This commit is contained in:
Cameron Gutman 2014-11-24 20:10:02 -08:00
parent 5dcff91d27
commit 871b73c48d
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/limelight/computers/ComputerManagerService.java
View File

@ -332,12 +332,22 @@ public class ComputerManagerService extends Service {
}
}
private ComputerDetails tryPollIp(InetAddress ipAddr) {
private ComputerDetails tryPollIp(ComputerDetails details, InetAddress ipAddr) {
try {
NvHTTP http = new NvHTTP(ipAddr, idManager.getUniqueId(),
null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
return http.getComputerDetails();
ComputerDetails newDetails = http.getComputerDetails();
// Check if this is the PC we expected
if (details.uuid != null && newDetails.uuid != null &&
!details.uuid.equals(newDetails.uuid)) {
// We got the wrong PC!
LimeLog.info("Polling returned the wrong PC!");
return null;
}
return newDetails;
} catch (Exception e) {
return null;
}
@ -347,19 +357,19 @@ public class ComputerManagerService extends Service {
ComputerDetails polledDetails;
if (localFirst) {
polledDetails = tryPollIp(details.localIp);
polledDetails = tryPollIp(details, details.localIp);
}
else {
polledDetails = tryPollIp(details.remoteIp);
polledDetails = tryPollIp(details, details.remoteIp);
}
if (polledDetails == null && !details.localIp.equals(details.remoteIp)) {
// Failed, so let's try the fallback
if (!localFirst) {
polledDetails = tryPollIp(details.localIp);
polledDetails = tryPollIp(details, details.localIp);
}
else {
polledDetails = tryPollIp(details.remoteIp);
polledDetails = tryPollIp(details, details.remoteIp);
}
// The fallback poll worked
@ -417,8 +427,8 @@ public class ComputerManagerService extends Service {
}
for (ComputerDetails computer : dbManager.getAllComputers()) {
// Add this computer without a thread
pollingTuples.add(new PollingTuple(computer, null));
// Add tuples for each computer
addTuple(computer);
}
releaseLocalDatabaseReference();