Changeset 7824

Timestamp:

Dec 28, 2010, 7:11:32 PM (13 years ago)

Author:

scheusso

Message:

this should prevent disconnecting clients from crashing our servers

File:

• code/branches/network6/src/libraries/network/Connection.cc (modified) (1 diff)

code/branches/network6/src/libraries/network/Connection.cc

@@ -183 +183 @@
     {
       case outgoingEventType::sendPacket:
-        assert(this->peerMap_.find(event.peerID) != this->peerMap_.end());
-        peer = this->peerMap_[event.peerID];
-        enet_peer_send( peer, event.channelID, event.packet );
+        // check whether the peer is still/already in the peer list
+        if( this->peerMap_.find(event.peerID) != this->peerMap_.end() )
+        {
+          peer = this->peerMap_[event.peerID];
+          enet_peer_send( peer, event.channelID, event.packet );
+        }
+        else
+        {
+          // peer probably already disconnected so just discard packet
+          assert(event.peerID<this->nextPeerID_);
+          delete event.packet;
+        }
         break;
       case outgoingEventType::disconnectPeer:
-        assert(this->peerMap_.find(event.peerID) != this->peerMap_.end());
-        peer = this->peerMap_[event.peerID];
-        enet_peer_disconnect(peer, 0);
+        if( this->peerMap_.find(event.peerID) != this->peerMap_.end() )
+        {
+          peer = this->peerMap_[event.peerID];
+          enet_peer_disconnect(peer, 0);
+        }
+        else
+        {
+          // peer probably already disconnected so just discard disconnect event
+          assert(event.peerID<this->nextPeerID_);
+        }
         break;
       case outgoingEventType::disconnectPeers: