Removed EQ_DEFAULT_PORT

The OS will always choose the server port.
This is needed to be able to run tests that use config files in parallel
reliably. This change also removes a spurious error trying to connect
to the default port, where no server will be listening anymore.

eq/fabric/client.cpp

@@ -54,31 +54,30 @@ bool Client::connectServer( co::NodePtr server )
     if( server->isConnected( ))
         return true;
 
-    co::ConnectionDescriptionPtr connDesc;
-    if( server->getConnectionDescriptions().empty( ))
-    {
-        connDesc = new co::ConnectionDescription;
-        connDesc->port = EQ_DEFAULT_PORT;
+    if( !server->getConnectionDescriptions().empty( ))
+        return connect( server );
+
+    const std::string& globalServer = Global::getServer();
+    const char* envServer = getenv( "EQ_SERVER" );
 
-        const std::string& globalServer = Global::getServer();
-        const char* envServer = getenv( "EQ_SERVER" );
-        std::string address = !globalServer.empty() ? globalServer :
-                               envServer            ? envServer : "localhost";
+    if( globalServer.empty() && envServer == 0 )
+        return false;
 
-        if( !connDesc->fromString( address ))
-            LBWARN << "Can't parse server address " << address << std::endl;
-        LBASSERT( address.empty( ));
-        LBDEBUG << "Connecting server " << connDesc->toString() << std::endl;
+    co::ConnectionDescriptionPtr connDesc( new co::ConnectionDescription );
+    std::string address = !globalServer.empty() ? globalServer : envServer;
 
-        server->addConnectionDescription( connDesc );
+    if( !connDesc->fromString( address ))
+    {
+        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

@@ -29,13 +29,6 @@
 #include <lunchbox/uint128_t.h>
 #include <lunchbox/visitorResult.h>
 
-#ifdef _WIN32
-#  define EQ_DEFAULT_PORT (4242)
-#else
-// #241: Avoid using privilege ports below 1024
-#  define EQ_DEFAULT_PORT ( (getuid() % 64511) + 1024 )
-#endif
-
 namespace eq
 {
 namespace fabric

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

@@ -33,6 +33,12 @@
     compound { channel \"channel\" wall { bottom_left  [ -.8 -.5 -1 ]      \
                                           bottom_right [  .8 -.5 -1 ]      \
                                           top_left     [ -.8  .5 -1 ] }}}}"
+#ifdef _WIN32
+#  define EQ_DEFAULT_PORT (4242)
+#else
+// #241: Avoid using privilege ports below 1024
+#  define EQ_DEFAULT_PORT ( (getuid() % 64511) + 1024 )
+#endif
 
 int main( const int argc, char** argv )
 {