Changeset 5847 for code

Timestamp:

Oct 1, 2009, 11:09:05 AM (15 years ago)

Author:

scheusso

Message:

fixing a bug that made a segfault/memory corruption/corrupted double linked list in some cases of client disconnect

Location:

code/branches/core5/src/libraries/network

Files:

• Connection.h (modified) (1 diff)
• Server.cc (modified) (1 diff)
• ServerConnection.cc (modified) (3 diffs)
• ServerConnection.h (modified) (1 diff)

code/branches/core5/src/libraries/network/Connection.h

@@ -64 +64 @@
     
     int service(ENetEvent* event);
-    void disconnectPeer(ENetPeer *peer);
+    virtual void disconnectPeer(ENetPeer *peer);
     
     void processQueue();

code/branches/core5/src/libraries/network/Server.cc

@@ -330 +330 @@
     // inform all the listeners
     ClientConnectionListener::broadcastClientDisconnected(client->getID());
-
-    delete client; //remove client from list
   }
 

code/branches/core5/src/libraries/network/ServerConnection.cc

@@ -103 +103 @@
   {
     Connection::disconnectPeer( client->getPeer() );
+    std::cout << "disconnecting peer and removing client" << endl;
     delete client;
   }
@@ -119 +120 @@
     ClientInformation *client = ClientInformation::findClient(clientID);
     if(client)
-      disconnectClient(client);
+      ServerConnection::disconnectClient(client);
   }
 
@@ -126 +127 @@
     ClientInformation *temp = ClientInformation::getBegin();
     while(temp!=0){
-      disconnectClient( temp );
+      ServerConnection::disconnectClient( temp );
       temp = temp->next();
     }

code/branches/core5/src/libraries/network/ServerConnection.h

@@ -59 +59 @@
     static bool addPacketAll(ENetPacket *packet);
     virtual void disconnectClient(ClientInformation *client);
-    void disconnectPeer( ENetEvent* event );
+    virtual void disconnectPeer( ENetEvent* event );
     void disconnectClient(int clientID);
   protected: