Changeset 1705 for code/branches/network/src/network/packet/Packet.cc

Timestamp:

Sep 4, 2008, 9:45:05 PM (16 years ago)

Author:

scheusso

Message:

further changes

File:

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

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

@@ -10 +10 @@
 #include "ClassID.h"
 #include "network/Host.h"
-//#include "Gamestate.h"
+#include "core/CoreIncludes.h"
 
 namespace network{
@@ -39 +39 @@
   clientID_ = ClientInformation::findClient(&peer->address)->getID();
   packetContent_ = createPacketContent(packet);
+  delete packet;
+  delete peer;
 }
 
@@ -49 +51 @@
 }
 
+void Packet::setPacketContent(PacketContent *content){
+  packetContent_ = content;
+  if(enetPacket_){
+    enet_packet_destroy(enetPacket_);
+    enetPacket_=0;
+  }
+}
 
 bool Packet::send(){
-  if(!packetDirection_ == ENUM::Outgoing || !packetDirection_ == ENUM::Bidirectional )
+  if(packetDirection_ != ENUM::Outgoing && packetDirection_ != ENUM::Bidirectional )
     return false;
   if(!enetPacket_){
     if(!packetContent_)
       return false;
+    COUT(3) << "creating packet with data: " << packetContent_->getData() << " size: " << packetContent_->getSize() << " and flags: " << packetContent_->getFlags() << std::endl;
     enetPacket_ = enet_packet_create(packetContent_->getData(), packetContent_->getSize(), packetContent_->getFlags());
   }
   network::Host::addPacket( enetPacket_, clientID_);
+  enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet
   return true;
 }
@@ -73 +84 @@
       break;
     case ENUM::ClassID:
-      packetContent_ = new ClassID( data );
+      packetContent_ = new ClassID( data, clientID_ );
       break;
     case ENUM::Gamestate: