Changeset 1749 for code/branches

Timestamp:

Sep 9, 2008, 1:43:47 PM (16 years ago)

Author:

scheusso

Message:

one memory problem less (enetpacket freeCallback should work find now)

File:

• code/branches/network/src/network/packet/Packet.cc (modified) (4 diffs)

code/branches/network/src/network/packet/Packet.cc

@@ -92 +92 @@
 
 Packet::~Packet(){
-  if(enetPacket_)
+  if(enetPacket_){
+    assert(enetPacket_->freeCallback==0);
     enet_packet_destroy(enetPacket_);
+  }
   if(data_)
     delete[] data_;
@@ -109 +111 @@
     }
     enetPacket_ = enet_packet_create(getData(), getSize(), getFlags());
-    //enetPacket_->freeCallback = &Packet::deletePacket;
-    enetPacket_->freeCallback = &blub;
+    enetPacket_->freeCallback = &Packet::deletePacket;
+//     enetPacket_->freeCallback = &blub;
     packetMap_[enetPacket_] = this;
   }
@@ -127 +129 @@
   }
 #endif
-  network::Host::addPacket( enetPacket_, clientID_);
+  ENetPacket *temp = enetPacket_;
   enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet
+  network::Host::addPacket( temp, clientID_);
   return true;
 }
@@ -169 +172 @@
 void Packet::deletePacket(ENetPacket *packet){
   assert(packetMap_[packet]);
+  assert(packetMap_[packet]->enetPacket_==0);
   delete packetMap_[packet];
 }