Let the OS choose the server port whenever it's not given.

This was already the case when no configuration file was provided,
the behavior is now extended to the configuration files where the port
is not given.
This is needed to be able to run tests that use config files in parallel
reliably.

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;
 }
 

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

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;

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 '}'
             {

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.