Changeset 7692 for code/branches/masterserver/src/libraries/network/WANDiscovery.cc

Timestamp:

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

Author:

smerkli

Message:

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

File:

• code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) (2 diffs)

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;
+      }
+    }
   }