Changeset 7763 for code/branches/presentation/src/libraries/network/MasterServerComm.cc

Timestamp:

Dec 15, 2010, 2:51:39 PM (13 years ago)

Author:

smerkli

Message:

disconnect implemented, switching to only use the MSC object of wandiscovery.

File:

• code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified) (6 diffs)

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

@@ -41 +41 @@
   {
     /* initialize Enet */
-    if (enet_initialize () != 0)
+    if( enet_initialize () != 0 )
     { COUT(1) << "An error occurred while initializing ENet.\n";
       return 1;
@@ -59 +59 @@
     /* see if it worked */
     if (this->client == NULL)
-    { COUT(1) << "An error occurred while trying to create an ENet client host.\n";
+    { COUT(1) << "An error occurred while trying to create an " 
+        << "ENet client host.\n";
       return 1;
     }
@@ -70 +71 @@
     /* destroy the enet facilities */
     enet_host_destroy(this->client);
-
-    /* install atexit handler for enet */
-    enet_deinitialize();
   }
 
@@ -84 +82 @@
     this->peer = enet_host_connect(this->client, &this->address, 2, 0);    
 
-    if (this->peer == NULL )
-    { COUT(2) << "ERROR: No available peers for initiating an ENet connection.\n";
+    if( this->peer == NULL )
+    { COUT(2) << "ERROR: No available peers for initiating an ENet"
+        << " connection.\n";
       return -1;
     }
@@ -96 +95 @@
     {
       enet_peer_reset (this->peer);
-      fprintf( stdout, "Connection to %s failed.", address );
       COUT(2) << "ERROR: connection to " << address << " failed.\n";
       return -1;
@@ -240 +238 @@
     /* One could just use enet_host_service() instead. */
     enet_host_flush( this->client );
-    if( packet ) free( packet );
+    enet_packet_destroy( packet );
 
     /* all done. */