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

Rename localIp/remoteIp fields to localAddress/remoteAddress to prepare for DNS names

Browse Source
This commit is contained in:
Cameron Gutman 2017-09-09 12:47:23 -07:00
parent d4f8d8f689
commit 60cd951774
4 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/limelight/computers/ComputerDatabaseManager.java
View File

@ -1,6 +1,5 @@
package com.limelight.computers; package com.limelight.computers;
import java.net.Inet6Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.LinkedList; import java.util.LinkedList;
@ -63,8 +62,8 @@ public class ComputerDatabaseManager {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(COMPUTER_NAME_COLUMN_NAME, details.name); values.put(COMPUTER_NAME_COLUMN_NAME, details.name);
values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid.toString()); values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid.toString());
values.put(LOCAL_IP_COLUMN_NAME, ADDRESS_PREFIX+details.localIp.getHostAddress()); values.put(LOCAL_IP_COLUMN_NAME, ADDRESS_PREFIX+details.localAddress.getHostAddress());
values.put(REMOTE_IP_COLUMN_NAME, ADDRESS_PREFIX+details.remoteIp.getHostAddress()); values.put(REMOTE_IP_COLUMN_NAME, ADDRESS_PREFIX+details.remoteAddress.getHostAddress());
values.put(MAC_COLUMN_NAME, details.macAddress); values.put(MAC_COLUMN_NAME, details.macAddress);
return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE); return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
} }
@ -87,14 +86,14 @@ public class ComputerDatabaseManager {
// too. To disambiguate, we'll need to prefix them with a string // too. To disambiguate, we'll need to prefix them with a string
// greater than the allowable IP address length. // greater than the allowable IP address length.
try { try {
details.localIp = InetAddress.getByAddress(c.getBlob(2)); details.localAddress = InetAddress.getByAddress(c.getBlob(2));
LimeLog.warning("DB: Legacy local address for "+details.name); LimeLog.warning("DB: Legacy local address for "+details.name);
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
// This is probably a hostname/address with the prefix string // This is probably a hostname/address with the prefix string
String stringData = c.getString(2); String stringData = c.getString(2);
if (stringData.startsWith(ADDRESS_PREFIX)) { if (stringData.startsWith(ADDRESS_PREFIX)) {
try { try {
details.localIp = InetAddress.getByName(c.getString(2).substring(ADDRESS_PREFIX.length())); details.localAddress = InetAddress.getByName(c.getString(2).substring(ADDRESS_PREFIX.length()));
} catch (UnknownHostException e1) { } catch (UnknownHostException e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
@ -105,14 +104,14 @@ public class ComputerDatabaseManager {
} }
try { try {
details.remoteIp = InetAddress.getByAddress(c.getBlob(3)); details.remoteAddress = InetAddress.getByAddress(c.getBlob(3));
LimeLog.warning("DB: Legacy remote address for "+details.name); LimeLog.warning("DB: Legacy remote address for "+details.name);
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
// This is probably a hostname/address with the prefix string // This is probably a hostname/address with the prefix string
String stringData = c.getString(3); String stringData = c.getString(3);
if (stringData.startsWith(ADDRESS_PREFIX)) { if (stringData.startsWith(ADDRESS_PREFIX)) {
try { try {
details.remoteIp = InetAddress.getByName(c.getString(3).substring(ADDRESS_PREFIX.length())); details.remoteAddress = InetAddress.getByName(c.getString(3).substring(ADDRESS_PREFIX.length()));
} catch (UnknownHostException e1) { } catch (UnknownHostException e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
@ -138,7 +137,7 @@ public class ComputerDatabaseManager {
ComputerDetails details = getComputerFromCursor(c); ComputerDetails details = getComputerFromCursor(c);
// If a field is corrupt or missing, skip the database entry // If a field is corrupt or missing, skip the database entry
if (details.uuid == null || details.localIp == null || details.remoteIp == null || if (details.uuid == null || details.localAddress == null || details.remoteAddress == null ||
details.macAddress == null) { details.macAddress == null) {
continue; continue;
} }
@ -164,7 +163,7 @@ public class ComputerDatabaseManager {
c.close(); c.close();
// If a field is corrupt or missing, delete the database entry // If a field is corrupt or missing, delete the database entry
if (details.uuid == null || details.localIp == null || details.remoteIp == null || if (details.uuid == null || details.localAddress == null || details.remoteAddress == null ||
details.macAddress == null) { details.macAddress == null) {
deleteComputer(details.name); deleteComputer(details.name);
return null; return null;

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

@ -155,7 +155,7 @@ public class ComputerManagerService extends Service {
} }
} }
}; };
t.setName("Polling thread for " + tuple.computer.localIp.getHostAddress()); t.setName("Polling thread for " + tuple.computer.localAddress.getHostAddress());
return t; return t;
} }
@ -313,8 +313,8 @@ public class ComputerManagerService extends Service {
if (tuple.computer.uuid.equals(details.uuid)) { if (tuple.computer.uuid.equals(details.uuid)) {
// Update details anyway in case this machine has been re-added by IP // Update details anyway in case this machine has been re-added by IP
// after not being reachable by our existing information // after not being reachable by our existing information
tuple.computer.localIp = details.localIp; tuple.computer.localAddress = details.localAddress;
tuple.computer.remoteIp = details.remoteIp; tuple.computer.remoteAddress = details.remoteAddress;
// Start a polling thread if polling is active // Start a polling thread if polling is active
if (pollingActive && tuple.thread == null) { if (pollingActive && tuple.thread == null) {
@ -342,8 +342,8 @@ public class ComputerManagerService extends Service {
public boolean addComputerBlocking(InetAddress addr) { public boolean addComputerBlocking(InetAddress addr) {
// Setup a placeholder // Setup a placeholder
ComputerDetails fakeDetails = new ComputerDetails(); ComputerDetails fakeDetails = new ComputerDetails();
fakeDetails.localIp = addr; fakeDetails.localAddress = addr;
fakeDetails.remoteIp = addr; fakeDetails.remoteAddress = addr;
// Block while we try to fill the details // Block while we try to fill the details
try { try {
@ -500,13 +500,13 @@ public class ComputerManagerService extends Service {
// If the local address is routable across the Internet, // If the local address is routable across the Internet,
// always consider this PC remote to be conservative // always consider this PC remote to be conservative
if (details.localIp.equals(details.remoteIp)) { if (details.localAddress.equals(details.remoteAddress)) {
reachability = ComputerDetails.Reachability.REMOTE; reachability = ComputerDetails.Reachability.REMOTE;
} }
else { else {
// Do a TCP-level connection to the HTTP server to see if it's listening // Do a TCP-level connection to the HTTP server to see if it's listening
LimeLog.info("Starting fast poll for "+details.name+" ("+details.localIp+", "+details.remoteIp+")"); LimeLog.info("Starting fast poll for "+details.name+" ("+details.localAddress +", "+details.remoteAddress +")");
reachability = fastPollPc(details.localIp, details.remoteIp); reachability = fastPollPc(details.localAddress, details.remoteAddress);
LimeLog.info("Fast poll for "+details.name+" returned "+reachability.toString()); LimeLog.info("Fast poll for "+details.name+" returned "+reachability.toString());
// If no connection could be established to either IP address, there's nothing we can do // If no connection could be established to either IP address, there's nothing we can do
@ -518,39 +518,39 @@ public class ComputerManagerService extends Service {
boolean localFirst = (reachability == ComputerDetails.Reachability.LOCAL); boolean localFirst = (reachability == ComputerDetails.Reachability.LOCAL);
if (localFirst) { if (localFirst) {
polledDetails = tryPollIp(details, details.localIp); polledDetails = tryPollIp(details, details.localAddress);
} }
else { else {
polledDetails = tryPollIp(details, details.remoteIp); polledDetails = tryPollIp(details, details.remoteAddress);
} }
InetAddress reachableAddr = null; InetAddress reachableAddr = null;
if (polledDetails == null && !details.localIp.equals(details.remoteIp)) { if (polledDetails == null && !details.localAddress.equals(details.remoteAddress)) {
// Failed, so let's try the fallback // Failed, so let's try the fallback
if (!localFirst) { if (!localFirst) {
polledDetails = tryPollIp(details, details.localIp); polledDetails = tryPollIp(details, details.localAddress);
} }
else { else {
polledDetails = tryPollIp(details, details.remoteIp); polledDetails = tryPollIp(details, details.remoteAddress);
} }
if (polledDetails != null) { if (polledDetails != null) {
// The fallback poll worked // The fallback poll worked
reachableAddr = !localFirst ? details.localIp : details.remoteIp; reachableAddr = !localFirst ? details.localAddress : details.remoteAddress;
} }
} }
else if (polledDetails != null) { else if (polledDetails != null) {
reachableAddr = localFirst ? details.localIp : details.remoteIp; reachableAddr = localFirst ? details.localAddress : details.remoteAddress;
} }
if (reachableAddr == null) { if (reachableAddr == null) {
return null; return null;
} }
if (polledDetails.remoteIp.equals(reachableAddr)) { if (polledDetails.remoteAddress.equals(reachableAddr)) {
polledDetails.reachability = ComputerDetails.Reachability.REMOTE; polledDetails.reachability = ComputerDetails.Reachability.REMOTE;
} }
else if (polledDetails.localIp.equals(reachableAddr)) { else if (polledDetails.localAddress.equals(reachableAddr)) {
polledDetails.reachability = ComputerDetails.Reachability.LOCAL; polledDetails.reachability = ComputerDetails.Reachability.LOCAL;
} }
else { else {
@ -572,7 +572,7 @@ public class ComputerManagerService extends Service {
ReachabilityTuple confirmationReachTuple = pollForReachability(initialReachTuple.computer); ReachabilityTuple confirmationReachTuple = pollForReachability(initialReachTuple.computer);
if (confirmationReachTuple == null) { if (confirmationReachTuple == null) {
// Neither of those seem to work, so we'll hold onto the address that did work // Neither of those seem to work, so we'll hold onto the address that did work
initialReachTuple.computer.localIp = initialReachTuple.reachableAddress; initialReachTuple.computer.localAddress = initialReachTuple.reachableAddress;
initialReachTuple.computer.reachability = ComputerDetails.Reachability.LOCAL; initialReachTuple.computer.reachability = ComputerDetails.Reachability.LOCAL;
} }
else { else {

2
app/src/main/java/com/limelight/utils/ServerHelper.java
View File

@ -20,7 +20,7 @@ import java.net.UnknownHostException;
public class ServerHelper { public class ServerHelper {
public static InetAddress getCurrentAddressFromComputer(ComputerDetails computer) { public static InetAddress getCurrentAddressFromComputer(ComputerDetails computer) {
return computer.reachability == ComputerDetails.Reachability.LOCAL ? return computer.reachability == ComputerDetails.Reachability.LOCAL ?
computer.localIp : computer.remoteIp; computer.localAddress : computer.remoteAddress;
} }
public static Intent createStartIntent(Activity parent, NvApp app, ComputerDetails computer, public static Intent createStartIntent(Activity parent, NvApp app, ComputerDetails computer,

2
moonlight-common

@ -1 +1 @@
Subproject commit 66567753b77b7d8efe24ec4a110c1089f653613a Subproject commit bea3830a63b4a8c537dc2f22c8b91e24c0545155