Changeset 7692

Timestamp:

Dec 1, 2010, 4:28:46 PM (13 years ago)

Author:

smerkli

Message:

done for today, didn't get bug to leave, and connect doesn't quite work yet.

Location:

code/branches/masterserver

Files:

• data/gui/scripts/MultiplayerMenu.lua (modified) (2 diffs)
• src/libraries/network/MasterServerComm.cc (modified) (4 diffs)
• src/libraries/network/MasterServerProtocol.h (modified) (1 diff)
• src/libraries/network/WANDiscovery.cc (modified) (2 diffs)
• src/libraries/network/WANDiscovery.h (modified) (1 diff)
• src/modules/masterserver/MasterServer.cc (modified) (1 diff)

code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua

@@ -98 +98 @@
     end
     
-function P.showServerList()
+function P.showServerListmeow()
     local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
     CEGUI.toListbox(listbox):resetList()
@@ -131 +131 @@
 
 -- same as above, but use WAN Discovery
-function P.showServerListWAN()
+function P.showServerList()
     local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
     CEGUI.toListbox(listbox):resetList()
     local discovery = orxonox.WANDiscovery:getInstance()
+    cout(0, "discovering.\n" )
     discovery:discover()
+    cout(0, "discovered.\n" )
     P.serverList = {}
     local index = 0

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

@@ -110 +110 @@
     /* see whether anything happened */
     /* WORK MARK REMOVE THIS OUTPUT */
-    //COUT(2) << "MARK polling...\n";
+    COUT(2) << "polling masterserver...\n";
+
+    /* address buffer */
+    char *addrconv = NULL;
+    int retval = 0;
 
     /* enet_host_service returns 0 if no event occured */
@@ -116 +120 @@
     if( enet_host_service( this->client, this->event, 1000 ) > 0 )
     { 
-      /* address buffer */
-      char *addrconv = NULL;
-      int retval = 0;
-
       /* check what type of event it is and react accordingly */
       switch (this->event->type)
@@ -131 +131 @@
         case ENET_EVENT_TYPE_RECEIVE: 
           addrconv = (char *) calloc( 50, 1 );
+          if( !addrconv ) 
+          { COUT(2) << "MasterServerComm.cc: Could not allocate memory!\n";
+            break;
+          }
+
+          /* resolve IP */
           enet_address_get_host_ip( &(this->event->peer->address), 
             addrconv, 49 );
@@ -175 +181 @@
     enet_host_flush( this->client );
    
-    if( packet ) free( packet );
+    /* free the packet */
+    enet_packet_destroy( packet );
 
     /* all done. */

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

@@ -31 +31 @@
 
 /* master server address (to be moved elsewhere later) */
-#define MS_ADDRESS "172.16.113.1"
+#define MS_ADDRESS "129.132.3.8"
 
 #define MSPROTO_CLIENT "CL"

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

@@ -96 +96 @@
        * the list
        */
-      return 1; 
+      return 2; 
     }
 
     /* done handling, return all ok code 0 */
-    return 0;
+    return 1;
   }
  
@@ -112 +112 @@
 
     /* poll for replies */
-    /* TODO add some timeout here so we don't wait indefinitely */
-    while( !((this->msc).pollForReply( rhandler )) )
-      /* nothing */;
-
-    /* done receiving. */
+    int i = WANDISC_MAXTRIES;
+    while( i > 0 )
+    {
+      /* poll for reply and act according to what was received */
+      switch( this->msc.pollForReply( rhandler ) )
+      { case 0: /* no event occured, decrease timeout */
+          --i; break;
+        case 1: /* got a list element, continue */ 
+          break;
+        case 2: /* done. */
+          i = 0; break;
+      }
+    }
   }
 

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

@@ -38 +38 @@
 #include <vector>
 
+#define WANDISC_MAXTRIES 5
 
 // tolua_begin

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

@@ -35 +35 @@
 {
   /* singleton stuff */
-  ManageScopedSingleton( MasterServer, ScopeID::Root, false );
+  //ManageScopedSingleton( MasterServer, ScopeID::Root, false );
 
   /* helpers */