From a1c659b7b8cda132b82e19115ce728497335ca2c Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Mon, 15 Jul 2019 01:24:39 -0700
Subject: [PATCH] Add support for IPv6-only hosts

---
 .../limelight/computers/ComputerManagerService.java | 13 ++++++++-----
 moonlight-common                                    |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/limelight/computers/ComputerManagerService.java b/app/src/main/java/com/limelight/computers/ComputerManagerService.java
index 940d34aa..8a3a0088 100644
--- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java
+++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java
@@ -3,6 +3,7 @@ package com.limelight.computers;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
+import java.net.Inet4Address;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.HashSet;
@@ -300,16 +301,18 @@ public class ComputerManagerService extends Service {
                 ComputerDetails details = new ComputerDetails();
 
                 // Populate the computer template with mDNS info
-                if (computer.getAddressV4() != null) {
-                    details.localAddress = computer.getAddressV4().getHostAddress();
+                if (computer.getLocalAddress() != null) {
+                    details.localAddress = computer.getLocalAddress().getHostAddress();
 
                     // Since we're on the same network, we can use STUN to find
                     // our WAN address, which is also very likely the WAN address
                     // of the PC. We can use this later to connect remotely.
-                    details.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
+                    if (computer.getLocalAddress() instanceof Inet4Address) {
+                        details.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
+                    }
                 }
-                if (computer.getAddressV6() != null) {
-                    details.ipv6Address = computer.getAddressV6().getHostAddress();
+                if (computer.getIpv6Address() != null) {
+                    details.ipv6Address = computer.getIpv6Address().getHostAddress();
                 }
 
                 // Kick off a serverinfo poll on this machine
diff --git a/moonlight-common b/moonlight-common
index 5872c0bf..a279f26b 160000
--- a/moonlight-common
+++ b/moonlight-common
@@ -1 +1 @@
-Subproject commit 5872c0bf3de27e8346258119abf341d5cd64d1d8
+Subproject commit a279f26b3fa8bb98e14839e55f507d798dfbc530