Changeset 1299 for code/branches/merge/src/network/Server.cc

Timestamp:

May 15, 2008, 10:08:41 PM (17 years ago)

Author:

scheusso

Message:

a huge fix in packetbuffer

File:

• code/branches/merge/src/network/Server.cc (modified) (5 diffs)

code/branches/merge/src/network/Server.cc

@@ -117 +117 @@
     ENetPacket *packet = packet_gen.chatMessage(msg.c_str());
     //std::cout <<"adding packets" << std::endl;
-    connection->addPacketAll(packet);
+    if(connection->addPacketAll(packet))
     //std::cout <<"added packets" << std::endl;
-    return connection->sendPackets();
+      return connection->sendPackets();
+    else
+      return false;
   }
 
@@ -162 +164 @@
       //clientID here is a reference to grab clientID from ClientInformation
       packet = connection->getPacket(clientID);
+      if(!packet)
+        continue;
       //if statement to catch case that packetbuffer is empty
       if( !elaborate(packet, clientID) ) 
-        COUT(4) << "Server: PacketBuffer empty" << std::endl;
+        COUT(3) << "Server: could not elaborate" << std::endl;
     }
   }
@@ -238 +242 @@
   
   bool Server::processConnectRequest( connectRequest *con, int clientID ){
-    COUT(4) << "processing connectRequest " << std::endl;
+    COUT(3) << "processing connectRequest " << std::endl;
     //connection->addPacket(packet_gen.gstate(gamestates->popGameState(clientID)) , clientID);
     connection->createClient(clientID);
@@ -250 +254 @@
         COUT(3) << "Could not push gamestate\t\t\t\t=====" << std::endl;
     else
+      if(clients->findClient(clientID))
         clients->findClient(clientID)->failures_=0;
   }
@@ -255 +260 @@
   void Server::disconnectClient(int clientID){
     ClientInformation *client = clients->findClient(clientID);
-    disconnectClient(client);
+    if(client)
+      disconnectClient(client);
   }
   void Server::disconnectClient( ClientInformation *client){