Changeset 7630 for code/branches/masterserver/src/modules

Timestamp:

Nov 10, 2010, 2:19:44 PM (14 years ago)

Author:

smerkli

Message:

initiated WANDiscovery code, now implementing…

Location:

code/branches/masterserver/src/modules/masterserver

Files:

• MasterServer.cc (modified) (1 diff)
• MasterServerComm.cc (modified) (3 diffs)

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

@@ -116 +116 @@
       << 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 */
-
-    /* game server or client connection? */
-    /* game server */
+    //[> 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 <]
+
+    /* GAME SERVER OR CLIENT CONNECTION? */
+
+    /* Game server */
     /* parse data */
     /* start actions */
     /* and send reply */
+
     /* client */
     /* parse data */

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

@@ -76 +76 @@
   { fprintf( stderr, 
         "No available peers for initiating an ENet connection.\n");
-    exit (EXIT_FAILURE);
+    //exit (EXIT_FAILURE);
+    return -1;
   }
 
@@ -87 +88 @@
     enet_peer_reset (this->peer);
     fprintf( stdout, "Connection to %s failed.", address );
-    exit(EXIT_FAILURE);
+    //exit(EXIT_FAILURE);
+    return -1;
   }
 
@@ -171 +173 @@
   /* setup object and connect */
   MasterServerComm msc = MasterServerComm();
-  msc.connect( argv[1], 1234 );
+  if( msc.connect( argv[1], 1234 ) )
+    exit(EXIT_FAILURE);
   
   /* send some data and poll for replies */