Changeset 7729 for code/branches/masterserver/src/libraries/network/MasterServer.cc

Timestamp:

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

Author:

smerkli

Message:

moved some files.

File:

• code/branches/masterserver/src/libraries/network/MasterServer.cc (copied) (copied from code/branches/masterserver/src/libraries/network/masterserver/MasterServer.cc) (4 diffs)

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