Changeset 7790

Timestamp:

Dec 21, 2010, 9:27:36 PM (13 years ago)

Author:

scheusso

Message:

changing landiscoverable port to fix problem when running masterserver and normal server on the same host

Location:

code/branches/presentation2/src

Files:

• libraries/network/LANDiscoverable.cc (modified) (1 diff)
• libraries/network/MasterServer.cc (modified) (1 diff)
• libraries/network/NetworkPrereqs.h (modified) (1 diff)
• orxonox/gamestates/GSServer.cc (modified) (2 diffs)

code/branches/presentation2/src/libraries/network/LANDiscoverable.cc

@@ -45 +45 @@
     this->host_ = 0;
     this->bActive_ = false;
-    this->setActivity(true);
+//     this->setActivity(true);
   }
 

code/branches/presentation2/src/libraries/network/MasterServer.cc

@@ -280 +280 @@
      * any input/output bandwidth */
     this->server = enet_host_create( &this->address, ORX_MSERVER_MAXCONNS, 
-        ORX_MSERVER_MAXCHANS, 0, 0 );     
+        ORX_MSERVER_MAXCHANS, 0, 0 );
+    assert(this->server);
 
     /* see if creation worked */

code/branches/presentation2/src/libraries/network/NetworkPrereqs.h

@@ -68 +68 @@
   extern const char* LAN_DISCOVERY_MESSAGE;
   extern const char* LAN_DISCOVERY_ACK;
-  static const unsigned int LAN_DISCOVERY_PORT          = 55557;
+  static const unsigned int LAN_DISCOVERY_PORT          = 55558;
   static const unsigned int NETWORK_PEER_ID_SERVER      = 0;
   static const unsigned int NETWORK_CHANNEL_DEFAULT     = 0;

code/branches/presentation2/src/orxonox/gamestates/GSServer.cc

@@ -34 +34 @@
 #include "core/GameMode.h"
 #include "network/Server.h"
+#include "network/Connection.h"
 
 namespace orxonox
@@ -39 +40 @@
     DeclareGameState(GSServer, "server", false, false);
 
-    SetCommandLineArgument(port, 55556).shortcut("p").information("Network communication port to be used 0-65535 (default: 55556)");
+    SetCommandLineArgument(port, NETWORK_PORT).shortcut("p").information("Network communication port to be used 0-65535 (default: 55556)");
 
     GSServer::GSServer(const GameStateInfo& info)