Changeset 7761 for code/branches/presentation/src/libraries

Timestamp:

Dec 15, 2010, 1:39:56 PM (14 years ago)

Author:

smerkli

Message:

disconnect implemented, getting ready for testing.

Location:

code/branches/presentation/src/libraries/network

Files:

• MasterServerComm.cc (modified) (3 diffs)
• MasterServerComm.h (modified) (1 diff)
• Server.cc (modified) (1 diff)

code/branches/presentation/src/libraries/network/MasterServerComm.cc

@@ -49 +49 @@
     this->event = (ENetEvent *)calloc( sizeof(ENetEvent), 1 );
     
-    /* install atexit handler for enet */
-    atexit( enet_deinitialize );
 
     /* initiate the client */
@@ -72 +70 @@
     /* destroy the enet facilities */
     enet_host_destroy(this->client);
+
+    /* install atexit handler for enet */
+    enet_deinitialize();
   }
 
@@ -101 +102 @@
 
     /* all fine */
+    return 0;
+  }
+
+  int MasterServerComm::disconnect( void )
+  {
+    enet_peer_disconnect( this->peer, 0 );
+
+    /* Allow up to 1 second for the disconnect to succeed
+     * and drop any packets received packets.
+     */
+    while (enet_host_service (this->client, this->event, 1000) > 0)
+    {
+      switch (this->event->type)
+      {
+        case ENET_EVENT_TYPE_RECEIVE:
+          enet_packet_destroy (event->packet);
+          break;
+
+        case ENET_EVENT_TYPE_DISCONNECT:
+          COUT(4) << "Disconnect from master server successful.\n"; 
+          return 0;
+        default: break;
+      }
+    }
+
+    /* We've arrived here, so the disconnect attempt didn't
+     * succeed yet, hence: force the connection down.            
+     */
+    enet_peer_reset( this->peer );
+
+    /* done */
     return 0;
   }

code/branches/presentation/src/libraries/network/MasterServerComm.h

@@ -62 +62 @@
       int connect( const char *address, unsigned int port );
 
+      /** \return 0 for success, other for error
+       * 
+       * Disconnect from master server.
+       */
+      int disconnect();
+
       /** \param data The data to be sent. 
        * \return 0 for success, other for error. 

code/branches/presentation/src/libraries/network/Server.cc

@@ -152 +152 @@
     this->disconnectClients();
     this->closeListener();
+    this->msc.disconnect();
     LANDiscoverable::setActivity(false);
     return;