From c3762534880ed6c96d4b2e2cdbc8f9d302c0af1d Mon Sep 17 00:00:00 2001
From: BWS Systems <info.bwssystems@gmail.com>
Date: Thu, 26 Mar 2020 13:34:27 -0400
Subject: [PATCH] Fix getting outbound route from inbound address

---
 .../HABridge/upnp/UpnpSettingsResource.java        |  1 +
 .../com/bwssystems/HABridge/util/AddressUtil.java  | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bwssystems/HABridge/upnp/UpnpSettingsResource.java b/src/main/java/com/bwssystems/HABridge/upnp/UpnpSettingsResource.java
index 30a1fa8..58c692d 100644
--- a/src/main/java/com/bwssystems/HABridge/upnp/UpnpSettingsResource.java
+++ b/src/main/java/com/bwssystems/HABridge/upnp/UpnpSettingsResource.java
@@ -98,6 +98,7 @@ public class UpnpSettingsResource {
 				if(theSettings.isUseupnpiface()) {
 					httpLocationAddr = theSettings.getUpnpConfigAddress();
 				} else {
+					log.debug("Get Outbound address for ip:" + request.ip() + " and port:" + request.port());
 					httpLocationAddr = AddressUtil.getOutboundAddress(request.ip(), request.port()).getHostAddress();
 				}
 				hueTemplate = hueTemplate_pre + hueTemplate_post;
diff --git a/src/main/java/com/bwssystems/HABridge/util/AddressUtil.java b/src/main/java/com/bwssystems/HABridge/util/AddressUtil.java
index 77dd960..6af47f2 100644
--- a/src/main/java/com/bwssystems/HABridge/util/AddressUtil.java
+++ b/src/main/java/com/bwssystems/HABridge/util/AddressUtil.java
@@ -15,9 +15,11 @@ public class AddressUtil {
     // in the LOCATION header in replies
     public static InetAddress getOutboundAddress(String remoteAddress, int remotePort) {
         InetAddress localAddress = null;
+        log.debug("Entering getOutboundAddress with args.");
         try {
-            getOutboundAddress(new InetSocketAddress(remoteAddress, remotePort));
+            localAddress = getOutboundAddress(new InetSocketAddress(remoteAddress, remotePort));
         } catch (Exception e) {
+            log.debug("getOutboundAddress(SocketAddress) Threw an Exception: " + e.getMessage());
             ParseRoute theRoute = ParseRoute.getInstance();
             try {
                 localAddress = InetAddress.getByName(theRoute.getLocalIPAddress());
@@ -29,7 +31,9 @@ public class AddressUtil {
         }
 
         if(localAddress != null)
-            log.debug("getOutbountAddress returning IP Address of " + localAddress.getHostAddress());
+            log.debug("localAddress is IP Address of " + localAddress.getHostAddress());
+        else
+            log.debug("localAddress returning NULL");
         return localAddress;
     }
 
@@ -42,11 +46,17 @@ public class AddressUtil {
 		DatagramSocket sock = new DatagramSocket();
 		// connect is needed to bind the socket and retrieve the local address
 		// later (it would return 0.0.0.0 otherwise)
+        log.debug("Entering getOutboundAddress with socket arg.");
 		sock.connect(remoteAddress);
+        log.debug("getOutboundAddress(SocketAddress) getLocalAddress.");
 		final InetAddress localAddress = sock.getLocalAddress();
 		sock.disconnect();
 		sock.close();
 		sock = null;
+        if(localAddress != null)
+            log.debug("getOutbountAddress(SocketAddress) returning IP Address of " + localAddress.getHostAddress());
+        else
+            log.debug("getOutboundAddress(SocketAddress) returning NULL");
 		return localAddress;
 	}
 }
\ No newline at end of file