Merge branch 'theqvd-fix-loopback-bind' into 3.6.x

Attributes GH PR #299: https://github.com/ArcticaProject/nx-libs/pull/299

Merge branch 'theqvd-fix-loopback-bind' into 3.6.x
8be276d2 · Mike Gabriel · e466a938 · 920f423a · 8be276d2
Unverified Commit 8be276d2 authored Dec 14, 2016 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

Loop.cpp nxcomp/Loop.cpp +8 -4

No files found.
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -6692,11 +6692,15 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
      strcpy(hostLabel, "any host");
    }

-    if (loopbackBind)
+    long bindPort;
+    if (socketAddress.getTCPHostAndPort(NULL, &bindPort))
    {
-      long bindPort;
-      if (socketAddress.getTCPHostAndPort(NULL, &bindPort))
-          socketAddress.setSpec("localhost", bindPort);
+      socketAddress.setSpec(loopbackBind ? "localhost" : "*", bindPort);
+    }
+    else
+    {
+      // This should never happen
+      cerr << "Error" << ": Unable to change bind host\n";
    }
  }
  else if (socketAddress.isUnixSocket())