[Stratagus-CVS] stratagus/src/network master.c

[Mohydine]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Mohydine <address@hidden>       03/10/17 19:53:13

Modified files:
        src/network    : master.c 

Log message:
        
----------------------------------------------------------------------Now
        checks if all port are used and return -1 if so. Still need to find out
        why sockets are not closed properly.

Patches:
Index: stratagus/src/network/master.c
diff -u stratagus/src/network/master.c:1.20 stratagus/src/network/master.c:1.21
--- stratagus/src/network/master.c:1.20 Fri Oct 17 19:44:47 2003
+++ stratagus/src/network/master.c      Fri Oct 17 19:53:12 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: master.c,v 1.20 2003/10/17 23:44:47 mohydine Exp $
+//     $Id: master.c,v 1.21 2003/10/17 23:53:12 mohydine Exp $
 
 //@{
 
@@ -80,33 +80,30 @@
 {
     int i; 
     char* reply;
-
+    int Port_Range_Min, Port_Range_Max;
+    Port_Range_Min=1234; 
+    Port_Range_Max=1244;
     reply = NULL;
     MetaServerFildes = NetworkFildes;
-    for (i = 1234; i < 1244; ++i) {
+    for (i = Port_Range_Min; i < Port_Range_Max; ++i) {
        MetaServerFildes = NetOpenTCP(i);       //FIXME: need to make a dynamic 
port allocation there...if (!MetaServerFildes) {...}
        if (MetaServerFildes != (Socket)-1) {
            if (NetConnectTCP(MetaServerFildes, NetResolveHost(MASTER_HOST), 
MASTER_PORT) != -1) {
                break;
            }
+           else {
+               if (i == Port_Range_Max) {
+                   return -1;
+               }
+           }
        }
     }
-    //TODO: clean up and check for full i>1244.
-
-    // FIXME: Configurable Meta Server
-    //i = NetConnectTCP(MetaServerFildes, NetResolveHost(MASTER_HOST), 
MASTER_PORT);
-    //if (i == -1) {
-       //TODO: Notify player that connection was aborted...
-    // return -1; 
-    //}
-       
+       
     if (SendMetaCommand("Login", "") == -1) {
-       //TODO: Notify player that connection was aborted...
        return -1;
     }
 
     if (RecvMetaReply(&reply) == -1) {
-       //TODO: Notify player that connection was aborted...
        return -1;
     } else {
        if (MetaServerOK(reply)) {