Changeset 1517 for code/branches

Timestamp:

Jun 2, 2008, 2:42:46 PM (16 years ago)

Author:

scheusso

Message:

improved client connection handling (better use of timeout)

Location:

code/branches/network/src/network

Files:

• ClientConnection.cc (modified) (4 diffs)
• ClientConnection.h (modified) (1 diff)

code/branches/network/src/network/ClientConnection.cc

@@ -107 +107 @@
     //network_threads.create_thread(boost::bind(boost::mem_fn(&ClientConnection::receiverThread), this));
     // wait 10 seconds for the connection to be established
-    return waitEstablished(3000);
+    return waitEstablished(NETWORK_CLIENT_CONNECT_TIMEOUT);
   }
 
@@ -169 +169 @@
       {
         boost::recursive_mutex::scoped_lock lock(enet_mutex_);
-        if(enet_host_service(client, event, NETWORK_CLIENT_TIMEOUT)<0){
+        if(enet_host_service(client, event, NETWORK_CLIENT_WAIT_TIME)<0){
           // we should never reach this point
           quit=true;
@@ -211 +211 @@
     boost::recursive_mutex::scoped_lock lock(enet_mutex_);
     enet_peer_disconnect(server, 0);
-    while(enet_host_service(client, &event, NETWORK_CLIENT_TIMEOUT) > 0){
+    while(enet_host_service(client, &event, NETWORK_CLIENT_WAIT_TIME) > 0){
       switch (event.type)
       {
@@ -238 +238 @@
     }
     // handshake
-    if(enet_host_service(client, &event, NETWORK_CLIENT_TIMEOUT)>=0 && event.type == ENET_EVENT_TYPE_CONNECT){
-      established=true;
-      return true;
-    }
-    else {
-      COUT(2) << "ClientConnection: enet_host_service < 0 or event.type != ENET_EVENT_TYPE_CONNECT # EVENT:" << event.type << std::endl;
-      return false;
-    }
+    while(enet_host_service(client, &event, NETWORK_CLIENT_WAIT_TIME)>=0 && !quit){
+      if( event.type == ENET_EVENT_TYPE_CONNECT ){
+        established=true;
+        return true;
+      }
+    }
+    COUT(2) << "ClientConnection: enet_host_service < 0 or event.type != ENET_EVENT_TYPE_CONNECT # EVENT:" << event.type << std::endl;
+    return false;
   }
 

code/branches/network/src/network/ClientConnection.h

@@ -54 +54 @@
 #define NETWORK_PORT 55556
 #define NETWORK_CLIENT_MAX_CONNECTIONS 5
-#define NETWORK_CLIENT_TIMEOUT 1
+#define NETWORK_CLIENT_WAIT_TIME 1
+#define NETWORK_CLIENT_CONNECT_TIMEOUT 3000 // miliseconds
 #define NETWORK_CLIENT_CHANNELS 2