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

Timestamp:

Dec 11, 2010, 9:07:55 PM (13 years ago)

Author:

smerkli

Message:

started implementing server pings, but need a change to masterservercomm soon.

File:

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

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

@@ -38 +38 @@
   } 
 
-
   int MasterServerComm::initialize()
   {
@@ -52 +51 @@
     /* install atexit handler for enet */
     atexit( enet_deinitialize );
-
 
     /* initiate the client */
@@ -87 +85 @@
     if (this->peer == NULL )
     { COUT(2) << "ERROR: No available peers for initiating an ENet connection.\n";
-    return -1;
+      return -1;
     }
 
@@ -102 +100 @@
     }
 
-    return 0;
-  }
-
-  int MasterServerComm::pollForReply( int (*callback)( char*, ENetEvent* ) )
+    /* all fine */
+    return 0;
+  }
+
+  /* NOTE this is to be reimplemented soon to return 
+   * a structure containing 
+   * - addrconv
+   * - the event
+   * so we can also make callbacks from objects
+   */
+  int MasterServerComm::pollForReply( int (*callback)( char*, ENetEvent* ),
+    int delayms )
   { 
     /* see whether anything happened */
@@ -117 +123 @@
     /* enet_host_service returns 0 if no event occured */
     /* just newly set below test to >0 from >= 0, to be tested */
-    if( enet_host_service( this->client, this->event, 1000 ) > 0 )
+    if( enet_host_service( this->client, this->event, delayms ) > 0 )
     { 
       /* check what type of event it is and react accordingly */
@@ -140 +146 @@
 
           /* DEBUG */
-          COUT(3) << "A packet of length " << this->event->packet->dataLength 
+          COUT(3) << "MasterServer Debug: A packet of length " 
+            << this->event->packet->dataLength 
             << " containing " << this->event->packet->data
             << " was received from " << addrconv 
             << " on channel " << this->event->channelID;
-          //printf( "A packet of length %u containing %s was "
-            //"received from %s on channel %u.\n",
-            //this->event->packet->dataLength,
-            //this->event->packet->data,
-            //addrconv,
-            //this->event->channelID );
           /* END DEBUG */
 
@@ -156 +157 @@
             retval = (*callback)( addrconv, (this->event) );
 
+          /* clean up */
           enet_packet_destroy( event->packet );
-          if( addrconv ) free( addrconv );
+          if( addrconv ) 
+            free( addrconv );
+
           break;
         default: break;
@@ -211 +215 @@
 
 }
-
-
-/* DON'T DELETE THIS I MIGHT NEED IT AGAIN -smerkli */
-/* not needed anymore, only here for testing purposes */
-/*
-//[> sample callback to output debugging info. <]
-//int callb( char *addr, ENetEvent *ev )
-//{ 
-  //printf( "A packet of length %u containing %s was "
-      //"received from %s on channel %u.\n",
-      //ev->packet->dataLength,
-      //ev->packet->data,
-      //addr,
-      //ev->channelID );
-  //return 0;
-//}
-
-//[> small testing implementation <]
-//int
-//main( int argc, char *argv[] )
-//{
-  //[> setup object and connect <]
-  //MasterServerComm msc = MasterServerComm();
-  //if( msc.connect( argv[1], 1234 ) )
-    //exit(EXIT_FAILURE);
-  
-  //[> send some data and poll for replies <]
-  //char *theinput = (char *)calloc( 100,1 );
-  //while( true )
-  //{ 
-    //fgets( theinput, 90, stdin );
-    //if( !strncmp( theinput, "quit", 4 ) )
-      //break;
-
-    //msc.sendRequest( theinput );
-    //msc.pollForReply( &callb );
-  //}
-
-//}
-*/