Changeset 7729

Timestamp:

Dec 8, 2010, 2:33:54 PM (14 years ago)

Author:

smerkli

Message:

moved some files.

Location:

code/branches/masterserver/src/libraries/network

Files:

• CMakeLists.txt (modified) (1 diff)
• MasterServer.cc (copied) (copied from code/branches/masterserver/src/libraries/network/masterserver/MasterServer.cc) (4 diffs)
• MasterServer.h (copied) (copied from code/branches/masterserver/src/libraries/network/masterserver/MasterServer.h) (4 diffs)
• MasterServerProtocol.h (modified) (1 diff)
• PeerList.cc (copied) (copied from code/branches/masterserver/src/libraries/network/masterserver/PeerList.cc)
• PeerList.h (copied) (copied from code/branches/masterserver/src/libraries/network/masterserver/PeerList.h)
• ServerList.cc (copied) (copied from code/branches/masterserver/src/libraries/network/masterserver/ServerList.cc)
• ServerList.h (copied) (copied from code/branches/masterserver/src/libraries/network/masterserver/ServerList.h)
• masterserver (deleted)

code/branches/masterserver/src/libraries/network/CMakeLists.txt

@@ -68 +68 @@
 ADD_SUBDIRECTORY(packet)
 ADD_SUBDIRECTORY(synchronisable)
+ADD_SUBDIRECTORY(masterserver)
 
 ORXONOX_ADD_LIBRARY(network

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

@@ -34 +34 @@
 namespace orxonox 
 {
-  /* singleton stuff */
-  //ManageScopedSingleton( MasterServer, ScopeID::Root, false );
-
   /* helpers */
   static void 
@@ -225 +222 @@
     /* tell people we're now initialized and blocking. */
     COUT(0) << "MasterServer initialized, waiting for connections.\n";
-
-    /* create an iterator for the loop */
-    while( enet_host_service( this->server, event, 1000 ) >= 0 )
-    { /* check what type of event it is and react accordingly */
-      switch (event->type)
-      { /* new connection */
-        case ENET_EVENT_TYPE_CONNECT: 
-          eventConnect( event ); break;
-
-          /* disconnect */
-        case ENET_EVENT_TYPE_DISCONNECT: 
-          eventDisconnect( event ); break;
-
-          /* incoming data */
-        case ENET_EVENT_TYPE_RECEIVE: eventData( event ); break;
-        default: break;
+    
+    /* endless loop until we quit */
+    while( this->quit == false )
+    {
+      /* create an iterator for the loop */
+      while( enet_host_service( this->server, event, 1000 ) >= 0 )
+      { /* check what type of event it is and react accordingly */
+        switch (event->type)
+        { /* new connection */
+          case ENET_EVENT_TYPE_CONNECT: 
+            eventConnect( event ); break;
+
+            /* disconnect */
+          case ENET_EVENT_TYPE_DISCONNECT: 
+            eventDisconnect( event ); break;
+
+            /* incoming data */
+          case ENET_EVENT_TYPE_RECEIVE: eventData( event ); break;
+          default: break;
+        }
       }
     }
-
-    /* free the event */
-    if( event ) free( event );
 
     /* done */
@@ -262 +260 @@
     /* register deinitialization */
     atexit( enet_deinitialize );
+
+    /* set the quit flag to false */
+    this->quit = false;
 
     /* Bind the server to the default localhost and port ORX_MSERVER_PORT */
@@ -282 +283 @@
     //this->mainlist = new ServerList();
     this->peers = new PeerList();
-    //if( this->mainlist == NULL || this->peers == NULL )
-    //{ COUT(1) << "Error creating server or peer list.\n";
-      //exit( EXIT_FAILURE );
-    //}
-
-    /* run the main method */
-    run();
   }
 

code/branches/masterserver/src/libraries/network/MasterServer.h

@@ -38 +38 @@
 #include <network/packet/Gamestate.h>
 #include <network/packet/Welcome.h>
-#include <util/Singleton.h>
 #include <network/MasterServerProtocol.h>
 
@@ -51 +50 @@
 {
   /* singleton */
-  class MasterServer: public Singleton<MasterServer>
+  class MasterServer
   {
     public:
@@ -57 +56 @@
       ~MasterServer();
 
-      friend class Singleton<MasterServer>;
-      static MasterServer& getInstance(void) 
-      { return Singleton<MasterServer>::getInstance(); }
-
-      /* data fields */
-      static MasterServer* singletonPtr_s;
-    
     private:
       /* methods */
@@ -79 +71 @@
       PeerList *peers;
 
+      unsigned int port;
+      bool quit;
+
       /* main routine */
       int run();
-
   };
 }

code/branches/masterserver/src/libraries/network/MasterServerProtocol.h

@@ -58 +58 @@
 
 
-#define ORX_MSERVER_PORT 1234
+#define ORX_MSERVER_PORT 55566