Changeset 7684

Timestamp:

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

Author:

smerkli

Message:

further testing.

Location:

code/branches/masterserver/src

Files:

• libraries/network/MasterServerComm.cc (modified) (5 diffs)
• libraries/network/MasterServerComm.h (modified) (1 diff)
• modules/masterserver/MasterServer.cc (modified) (3 diffs)
• modules/masterserver/MasterServer.h (modified) (1 diff)

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

@@ -46 +46 @@
       return 1;
     }
+
+    /* initialize the event holder */
+    this->event = (ENetEvent *)calloc( sizeof(ENetEvent), 1 );
     
     /* install atexit handler for enet */
@@ -89 +92 @@
 
     /* Wait up to 2 seconds for the connection attempt to succeed. */
-    if (enet_host_service (this->client, &this->event, 2000) > 0 &&
-        this->event.type == ENET_EVENT_TYPE_CONNECT )
+    if (enet_host_service (this->client, this->event, 2000) > 0 &&
+        this->event->type == ENET_EVENT_TYPE_CONNECT )
       fprintf( stdout, "Connection to server succeeded." );
     else
@@ -107 +110 @@
     /* see whether anything happened */
     /* WORK MARK REMOVE THIS OUTPUT */
-    COUT(2) << "MARK polling...\n";
+    //COUT(2) << "MARK polling...\n";
 
     /* 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, 1000 ) > 0 )
     { 
       /* address buffer */
@@ -118 +121 @@
 
       /* check what type of event it is and react accordingly */
-      switch (this->event.type)
+      switch (this->event->type)
       { /* new connection, not supposed to happen. */
         case ENET_EVENT_TYPE_CONNECT: break;
@@ -128 +131 @@
         case ENET_EVENT_TYPE_RECEIVE: 
           addrconv = (char *) calloc( 50, 1 );
-          enet_address_get_host_ip( &(this->event.peer->address), addrconv, 49 );
+          enet_address_get_host_ip( &(this->event->peer->address), 
+            addrconv, 49 );
 
           /* DEBUG */
           printf( "A packet of length %u containing %s was "
             "received from %s on channel %u.\n",
-            this->event.packet->dataLength,
-            this->event.packet->data,
+            this->event->packet->dataLength,
+            this->event->packet->data,
             addrconv,
-            this->event.channelID );
+            this->event->channelID );
           /* END DEBUG */
 
           /* call the supplied callback, if any. */
           if( (*callback) != NULL )
-            retval = (*callback)( addrconv, &(this->event) );
-
-          enet_packet_destroy( event.packet );
+            retval = (*callback)( addrconv, (this->event) );
+
+          enet_packet_destroy( event->packet );
           if( addrconv ) free( addrconv );
           break;

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

@@ -85 +85 @@
 
       /** event data holder */
-      ENetEvent event;
+      ENetEvent *event;
 
       /** address holder */

code/branches/masterserver/src/modules/masterserver/MasterServer.cc

@@ -36 +36 @@
   /* singleton stuff */
   //ManageScopedSingleton( MasterServer, ScopeID::Root, false );
+
+  /* helpers */
+  static void 
+  helper_output_debug( ENetEvent *event, char *addrconv )
+  {
+    COUT(4) << "A packet of length" 
+      << event->packet->dataLength
+      << " containing "
+      << (const char*)event->packet->data
+      << " was received from "
+      << addrconv 
+      << " on channel "
+      << event->channelID << "\n";
+  }
+
+  void
+  MasterServer::helper_sendlist( ENetEvent *event )
+  {
+    /* get an iterator */
+    std::list<packet::ServerInformation>::iterator i;
+
+    /* packet holder */
+    ENetPacket *reply;
+
+    /* loop through list elements */
+    for( i = mainlist.serverlist.begin(); i 
+        != mainlist.serverlist.end(); ++i ) 
+    {
+      /* WORK MARK */
+      /* send this particular server */
+      /* build reply string */
+      char *tosend = (char *)calloc( (*i).getServerIP().length() 
+          + MSPROTO_SERVERLIST_ITEM_LEN + 2,1 );
+      if( !tosend ) 
+      { COUT(2) << "Masterserver.cc: Memory allocation failed.\n";
+        continue;
+      } 
+      sprintf( tosend, "%s %s", MSPROTO_SERVERLIST_ITEM, 
+          (*i).getServerIP().c_str() );
+
+      /* create packet from it */
+      reply = enet_packet_create( tosend,
+          strlen( tosend ) + 1, 
+          ENET_PACKET_FLAG_RELIABLE);
+
+      /* Send the reply to the peer over channel id 0. */
+      enet_peer_send( event->peer, 0, reply );
+
+      /* One could just use enet_host_service() instead. */
+      enet_host_flush( this->server );
+
+      /* free the tosend buffer */
+      free( tosend );
+    } 
+
+    /* send end-of-list packet */
+    reply = enet_packet_create( MSPROTO_SERVERLIST_END,
+        MSPROTO_SERVERLIST_END_LEN + 1,
+        ENET_PACKET_FLAG_RELIABLE );
+
+    enet_peer_send( event->peer, 0, reply );
+
+    /* One could just use enet_host_service() instead. */
+    enet_host_flush( this->server );
+  }
+
+
+
 
   /***** EVENTS *****/
@@ -105 +173 @@
     /* DEBUG */
     /* output debug info about the data that has come, to be removed */
-    COUT(4) << "A packet of length" 
-      << event->packet->dataLength
-      << " containing "
-      << (const char*)event->packet->data
-      << " was received from "
-      << addrconv 
-      << " on channel "
-      << event->channelID << "\n";
-
-    /*
-    //[> send some packet back for testing <]
-    //[> TESTING <]
-
-    //[> Create a reliable reply of size 7 containing "reply\0" <]
-    //ENetPacket * reply = enet_packet_create ("reply", 
-        //strlen ("reply") + 1, 
-        //ENET_PACKET_FLAG_RELIABLE);
-
-    //[> Send the reply to the peer over channel id 0. <]
-    //enet_peer_send( event->peer, 0, reply );
-
-    //[> One could just use enet_host_service() instead. <]
-    //enet_host_flush( this->server );
-
-    //[> /TESTING <]
-    */
+    helper_output_debug( event, addrconv );
 
     /* GAME SERVER OR CLIENT CONNECTION? */
@@ -151 +194 @@
       MSPROTO_CLIENT_LEN) )
     { /* client */
-      
       if( !strncmp( (char *)event->packet->data + MSPROTO_CLIENT_LEN+1,
         MSPROTO_REQ_LIST, MSPROTO_REQ_LIST_LEN ) )
-      { /* send server list */
-        
-        /* get an iterator */
-        std::list<packet::ServerInformation>::iterator i;
-
-        /* packet holder */
-        ENetPacket *reply;
-
-        /* loop through list elements */
-        for( i = mainlist.serverlist.begin(); i != mainlist.serverlist.end(); ++i ) 
-        {
-          /* WORK MARK */
-          /* send this particular server */
-          /* build reply string */
-          char *tosend = (char *)calloc( (*i).getServerIP().length() + MSPROTO_SERVERLIST_ITEM_LEN + 2,1 );
-          sprintf( tosend, "%s %s", MSPROTO_SERVERLIST_ITEM, (*i).getServerIP().c_str() );
-
-          /* create packet from it */
-           reply = enet_packet_create( tosend,
-            strlen( tosend ) + 1, 
-            ENET_PACKET_FLAG_RELIABLE);
-
-          /* Send the reply to the peer over channel id 0. */
-          enet_peer_send( event->peer, 0, reply );
-
-          /* One could just use enet_host_service() instead. */
-          enet_host_flush( this->server );
-        } 
-
-        /* send end-of-list packet */
-        reply = enet_packet_create( MSPROTO_SERVERLIST_END,
-          MSPROTO_SERVERLIST_END_LEN + 1,
-          ENET_PACKET_FLAG_RELIABLE );
-
-        enet_peer_send( event->peer, 0, reply );
-
-        /* One could just use enet_host_service() instead. */
-        enet_host_flush( this->server );
-
-      }
+        /* send server list */
+        helper_sendlist( event );
     }
     else

code/branches/masterserver/src/modules/masterserver/MasterServer.h

@@ -70 +70 @@
       int eventData( ENetEvent *event );
 
+      /* helpers */
+      void helper_sendlist( ENetEvent *event );
+
       /* members */
       ENetAddress address;