Changeset 1377 for code/branches

Timestamp:

May 22, 2008, 4:23:29 PM (16 years ago)

Author:

dumenim

Message:

some changes on clientside (replaces some enet_host_service with enet_host_flush and so on)

Location:

code/branches/network/src/network

Files:

• Client.cc (modified) (2 diffs)
• ClientConnection.cc (modified) (5 diffs)
• ClientConnection.h (modified) (2 diffs)

code/branches/network/src/network/Client.cc

@@ -122 +122 @@
       COUT(3) << "sending connectrequest" << std::endl;
       if(!client_connection.addPacket(pck_gen.generateConnectRequest()) || !client_connection.sendPackets())
-        COUT(1) << "could not create connection" << std::endl;
+        COUT(1) << "could not send connection request !!!!!!!!!" << std::endl;
     }else
-      COUT(1) << "could not create connection" << std::endl;
+      COUT(1) << "could not create connection laber" << std::endl;
     return isConnected;
   }
@@ -216 +216 @@
     if(!isConnected)
       return false;
-    ENetEvent event;
-    // send packets
-    client_connection.sendPackets(&event);
-    if(event.type==ENET_EVENT_TYPE_NONE)
-      return true;
-    else
-      return false;
+    // send packets
+    client_connection.sendPackets();
+    return true;
   }
 

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

@@ -98 +98 @@
     //network_threads.create_thread(boost::bind(boost::mem_fn(&ClientConnection::receiverThread), this));
     // wait 10 seconds for the connection to be established
-    return waitEstablished(10000);
+    return waitEstablished(3000);
   }
 
@@ -123 +123 @@
   }
 
-  bool ClientConnection::sendPackets(ENetEvent *event) {
+//   bool ClientConnection::sendPackets(ENetEvent *event) {
+//     if(server==NULL)
+//       return false;
+//     if(enet_host_service(client, event, NETWORK_SEND_WAIT)>=0){
+//       return true;}
+//     else
+//       return false;
+//   }
+
+  bool ClientConnection::sendPackets() {
+    ENetEvent event;
     if(server==NULL)
       return false;
-    if(enet_host_service(client, event, NETWORK_SEND_WAIT)>=0){
-      return true;}
-    else
-      return false;
-  }
-
-  bool ClientConnection::sendPackets() {
-    ENetEvent event;
-    if(server==NULL)
-      return false;
-    if(enet_host_service(client, &event, NETWORK_SEND_WAIT)>=0){
-      return true;}
-    else
-      return false;
+    enet_host_flush(client);
+    return true;
   }
 
@@ -148 +146 @@
     ENetEvent event;
     client = enet_host_create(NULL, NETWORK_CLIENT_MAX_CONNECTIONS, 0, 0);
-    if(client==NULL)
+    if(client==NULL) {
+      COUT(2) << "ClientConnection: could not create client host" << std::endl;
       // add some error handling here ==========================
       quit=true;
+    }
     //connect to the server
     if(!establishConnection()){
+      COUT(2) << "clientConn: receiver thread: could not establishConnection" << std::endl;
       quit=true;
       return;
@@ -167 +168 @@
         // log handling ================
       case ENET_EVENT_TYPE_CONNECT:
+        break;
       case ENET_EVENT_TYPE_RECEIVE:
         COUT(5) << "Cl.Con: receiver-Thread while loop: got new packet" << std::endl;
@@ -213 +215 @@
     // connect to peer (server is type ENetPeer*)
     server = enet_host_connect(client, &serverAddress, NETWORK_CLIENT_CHANNELS);
-    if(server==NULL)
+    if(server==NULL) {
+      COUT(2) << "ClientConnection: server == NULL" << std::endl;
       // error handling
       return false;
+    }
     // handshake
-    if(enet_host_service(client, &event, NETWORK_CLIENT_TIMEOUT)>0 && event.type == ENET_EVENT_TYPE_CONNECT){
+    if(enet_host_service(client, &event, NETWORK_CLIENT_TIMEOUT)>=0 && event.type == ENET_EVENT_TYPE_CONNECT){
       established=true;
       return true;
     }
-    else
-      return false;
+    else {
+      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 100
-#define NETWORK_SEND_WAIT 5
+#define NETWORK_CLIENT_TIMEOUT 10000
+#define NETWORK_SEND_WAIT 500
 #define NETWORK_CLIENT_CHANNELS 2
 
@@ -75 +75 @@
     bool sendPackets();
     // send out all queued packets and save result in event
-    bool sendPackets(ENetEvent *event);
+    //bool sendPackets(ENetEvent *event);
     bool waitEstablished(int milisec);
     bool isConnected(){return established;}