Fix bug #525: PANIC! No port specified for multimedia connections

Commit 5f1eb0dc introduced a regression that made the use of the multimedia port mandatory. Fixes ArcticaProject/nx-libs#525

Fix bug #525: PANIC! No port specified for multimedia connections
f2c73bd8 · Vadim Troshchinskiy · 17ae45e0 · f2c73bd8 · f2c73bd8 · f2c73bd8
Commit f2c73bd8 authored Oct 10, 2017 by Vadim Troshchinskiy
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 11 deletions

ChannelEndPoint.cpp nxcomp/src/ChannelEndPoint.cpp +5 -0

ChannelEndPoint.h nxcomp/src/ChannelEndPoint.h +1 -0

Loop.cpp nxcomp/src/Loop.cpp +13 -11

No files found.
--- a/nxcomp/src/ChannelEndPoint.cpp
+++ b/nxcomp/src/ChannelEndPoint.cpp
@@ -312,6 +312,11 @@ ChannelEndPoint::enabled() const {
 }
 bool
+ChannelEndPoint::configured() const {
+  return ( spec_ && ( strcmp(spec_, "0") != 0) );
+}
+bool
 ChannelEndPoint::validateSpec() {
  isTCP_ = getTCPHostAndPort();
  isUnix_ = getUnixPath();

--- a/nxcomp/src/ChannelEndPoint.h
+++ b/nxcomp/src/ChannelEndPoint.h
@@ -46,6 +46,7 @@ class ChannelEndPoint
  ~ChannelEndPoint();
  ChannelEndPoint &operator=(const ChannelEndPoint &other);
+  bool configured() const;
  bool enabled() const;
  bool disabled() { return !enabled(); }
  void disable();

--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -11746,20 +11746,22 @@ int SetPorts()
 	  << logofs_flush;
 #endif
-  if (control -> ProxyMode == proxy_client) {
+  if ( mediaPort.configured() ) {
-    mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
+    if (control -> ProxyMode == proxy_client) {
-    useMediaSocket = mediaPort.enabled();
+      mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
-  } else {
+      useMediaSocket = mediaPort.enabled();
+    } else {
-    if ( !mediaPort.enabled() ) {
+      if ( mediaPort.getTCPPort() < 0 ) {
-      #ifdef PANIC
+        #ifdef PANIC
-      *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
+        *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
-              << logofs_flush;
+                << logofs_flush;
-      #endif
+        #endif
-      cerr << "Error" << ": No port specified for multimedia connections.\n";
+        cerr << "Error" << ": No port specified for multimedia connections.\n";
-      HandleCleanup();
+        HandleCleanup();
+      }
    }
  }