Merge pull request #504 from hernando/no_default_port

Let the OS choose the server port when the config doesn't have one.
Eyescale · Nov 3, 2015 · 30c6a69 · 30c6a69
2 parents 47b7446 + 42a4c98
commit 30c6a69
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git a/eq/fabric/client.cpp b/eq/fabric/client.cpp
@@ -54,31 +54,27 @@ bool Client::connectServer( co::NodePtr server )
     if( server->isConnected( ))
         return true;
 
-    co::ConnectionDescriptionPtr connDesc;
-    if( server->getConnectionDescriptions().empty( ))
+    if( !server->getConnectionDescriptions().empty( ))
+        return connect( server );
+
+    co::ConnectionDescriptionPtr connDesc( new co::ConnectionDescription );
+    connDesc->port = EQ_DEFAULT_PORT;
+    const std::string& globalServer = Global::getServer();
+    const char* envServer = getenv( "EQ_SERVER" );
+    std::string address = !globalServer.empty() ? globalServer :
+                           envServer            ? envServer : "localhost";
+    if( !connDesc->fromString( address ))
     {
-        connDesc = new co::ConnectionDescription;
-        connDesc->port = EQ_DEFAULT_PORT;
-
-        const std::string& globalServer = Global::getServer();
-        const char* envServer = getenv( "EQ_SERVER" );
-        std::string address = !globalServer.empty() ? globalServer :
-                               envServer            ? envServer : "localhost";
-
-        if( !connDesc->fromString( address ))
-            LBWARN << "Can't parse server address " << address << std::endl;
-        LBASSERT( address.empty( ));
-        LBDEBUG << "Connecting server " << connDesc->toString() << std::endl;
-
-        server->addConnectionDescription( connDesc );
+        LBWARN << "Can't parse server address " << address << std::endl;
+        return false;
     }
+    LBDEBUG << "Connecting server " << connDesc->toString() << std::endl;
+    server->addConnectionDescription( connDesc );
 
     if( connect( server ))
         return true;
 
-    if( connDesc ) // clean up
-        server->removeConnectionDescription( connDesc );
-
+    server->removeConnectionDescription( connDesc );
     return false;
 }
 

diff --git a/eq/fabric/types.h b/eq/fabric/types.h
@@ -33,7 +33,7 @@
 #  define EQ_DEFAULT_PORT (4242)
 #else
 // #241: Avoid using privilege ports below 1024
-#  define EQ_DEFAULT_PORT ( (getuid() % 64511) + 1024 )
+#  define EQ_DEFAULT_PORT (( getuid() % 64511 ) + 1024 )
 #endif
 
 namespace eq

diff --git a/eq/server/convert11Visitor.h b/eq/server/convert11Visitor.h
@@ -46,7 +46,7 @@ class ConvertTo11Visitor : public ServerVisitor
             LBINFO << "Adding default server connection for multi-node config"
                    << std::endl;
             co::ConnectionDescriptionPtr desc = new co::ConnectionDescription;
-            desc->port = EQ_DEFAULT_PORT;
+            desc->port = 0; // Let the OS choose the port.
             server->addConnectionDescription( desc );
         }
         return TRAVERSE_CONTINUE;

diff --git a/eq/server/loader.y b/eq/server/loader.y
@@ -578,7 +578,7 @@ serverConnection: EQTOKEN_CONNECTION
         '{' {
                 connectionDescription = new eq::server::ConnectionDescription;
                 connectionDescription->setHostname( "" );
-                connectionDescription->port = EQ_DEFAULT_PORT;
+                connectionDescription->port = 0; // OS chosen port
             }
             connectionFields '}'
             {

diff --git a/tools/server/eqServer.cpp b/tools/server/eqServer.cpp
@@ -6,12 +6,12 @@
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 2.1 as published
  * by the Free Software Foundation.
- *  
+ *
  * This library is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this library; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.