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

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:45:41 -07:00
parent fe71b1be20
commit e7f92d3667
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
moonlight-common/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
View File

@ -16,8 +16,8 @@ public class ComputerDetails {
public Reachability reachability; public Reachability reachability;
public String name; public String name;
public UUID uuid; public UUID uuid;
public InetAddress localIp; public InetAddress localAddress;
public InetAddress remoteIp; public InetAddress remoteAddress;
public PairingManager.PairState pairState; public PairingManager.PairState pairState;
public String macAddress; public String macAddress;
public int runningGameId; public int runningGameId;
@ -39,8 +39,8 @@ public class ComputerDetails {
this.reachability = details.reachability; this.reachability = details.reachability;
this.name = details.name; this.name = details.name;
this.uuid = details.uuid; this.uuid = details.uuid;
this.localIp = details.localIp; this.localAddress = details.localAddress;
this.remoteIp = details.remoteIp; this.remoteAddress = details.remoteAddress;
this.macAddress = details.macAddress; this.macAddress = details.macAddress;
this.pairState = details.pairState; this.pairState = details.pairState;
this.runningGameId = details.runningGameId; this.runningGameId = details.runningGameId;
@ -54,8 +54,8 @@ public class ComputerDetails {
str.append("Reachability: ").append(reachability).append("\n"); str.append("Reachability: ").append(reachability).append("\n");
str.append("Name: ").append(name).append("\n"); str.append("Name: ").append(name).append("\n");
str.append("UUID: ").append(uuid).append("\n"); str.append("UUID: ").append(uuid).append("\n");
str.append("Local IP: ").append(localIp).append("\n"); str.append("Local IP: ").append(localAddress).append("\n");
str.append("Remote IP: ").append(remoteIp).append("\n"); str.append("Remote IP: ").append(remoteAddress).append("\n");
str.append("MAC Address: ").append(macAddress).append("\n"); str.append("MAC Address: ").append(macAddress).append("\n");
str.append("Pair State: ").append(pairState).append("\n"); str.append("Pair State: ").append(pairState).append("\n");
str.append("Running Game ID: ").append(runningGameId).append("\n"); str.append("Running Game ID: ").append(runningGameId).append("\n");

4
moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java
View File

@ -223,8 +223,8 @@ public class NvHTTP {
externalIpStr = address.getHostAddress(); externalIpStr = address.getHostAddress();
} }
details.localIp = InetAddress.getByName(localIpStr); details.localAddress = InetAddress.getByName(localIpStr);
details.remoteIp = InetAddress.getByName(externalIpStr); details.remoteAddress = InetAddress.getByName(externalIpStr);
try { try {
details.pairState = Integer.parseInt(getXmlString(serverInfo, "PairStatus")) == 1 ? details.pairState = Integer.parseInt(getXmlString(serverInfo, "PairStatus")) == 1 ?

4
moonlight-common/src/main/java/com/limelight/nvstream/wol/WakeOnLanSender.java
View File

@ -23,10 +23,10 @@ public class WakeOnLanSender {
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
InetAddress addr; InetAddress addr;
if (i == 0) { if (i == 0) {
addr = computer.localIp; addr = computer.localAddress;
} }
else { else {
addr = computer.remoteIp; addr = computer.remoteAddress;
} }
// Try all the ports for each address // Try all the ports for each address