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

Timestamp:

Sep 5, 2008, 11:32:42 PM (16 years ago)

Author:

scheusso

Message:

we use enetcallback for destroying packets now (unfortunately there are still some problems)

File:

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

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Oliver Scheuss, (C) 2008
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 
 #include <enet/enet.h>
+#include <boost/bind.hpp>
 
 #include "Packet.h"
@@ -10 +39 @@
 #include "ClassID.h"
 #include "Gamestate.h"
+#include "Welcome.h"
 #include "network/Host.h"
 #include "core/CoreIncludes.h"
@@ -17 +47 @@
 namespace packet{
   
+#define PACKET_FLAG_DEFAULT ENET_PACKET_FLAG_NO_ALLOCATE
 #define _PACKETID           0
   
-
+std::map<ENetPacket *, Packet *> Packet::packetMap_;
   
 Packet::Packet(){
+  flags_ = PACKET_FLAG_DEFAULT;
   packetDirection_ = ENUM::Outgoing;
   clientID_=0;
-  packetContent_=0;
+  data_=0;
   enetPacket_=0;
 }
 
-Packet::Packet(PacketContent *content){
+Packet::Packet(unsigned char *data, int clientID){
+  flags_ = PACKET_FLAG_DEFAULT;
   packetDirection_ = ENUM::Outgoing;
-  clientID_=0;
-  packetContent_=content;
+  clientID_=clientID;
+  data_=data;
   enetPacket_=0;
 }
@@ -39 +72 @@
   enetPacket_ = packet;
   clientID_ = ClientInformation::findClient(&peer->address)->getID();
-  packetContent_ = createPacketContent(packet);
+  data_ = packet->data;
   enet_packet_destroy(packet);
 }
 
-Packet::~Packet(){
-  if(enetPacket_){
-    enet_packet_destroy(enetPacket_);
-  }
+Packet::Packet(const Packet &p){
+  flags_=p.flags_;
+  if(p.data_){
+    data_ = new unsigned char[p.getSize()];
+    memcpy(data_, p.data_, p.getSize());
+  }else
+    data_=0;
 }
 
-void Packet::setPacketContent(PacketContent *content){
-  packetContent_ = content;
-  if(enetPacket_){
+Packet::~Packet(){
+  if(enetPacket_)
     enet_packet_destroy(enetPacket_);
-    enetPacket_=0;
-  }
+  if(data_)
+    delete[] data_;
 }
 
@@ -61 +96 @@
     return false;
   if(!enetPacket_){
-    if(!packetContent_)
+    if(!data_)
       return false;
-    enetPacket_ = enet_packet_create(packetContent_->getData(), packetContent_->getSize(), packetContent_->getFlags());
+    enetPacket_ = enet_packet_create(getData(), getSize(), getFlags());
+    enetPacket_->freeCallback = &Packet::deletePacket;
+    packetMap_[enetPacket_] = this;
   }
   network::Host::addPacket( enetPacket_, clientID_);
@@ -70 +107 @@
 }
 
-PacketContent *Packet::createPacketContent(ENetPacket *packet){
+Packet *Packet::createPacket(ENetPacket *packet, ENetPeer *peer){
   unsigned char *data = packet->data;
+  unsigned int clientID = ClientInformation::findClient(&peer->address)->getID();
+  Packet *p;
   switch( *(ENUM::Type *)&data[_PACKETID] )
   {
     case ENUM::Acknowledgement:
-      packetContent_ = new Acknowledgement( data, clientID_ );
+      p = new Acknowledgement( data, clientID );
       break;
     case ENUM::Chat:
-      packetContent_ = new Chat( data, clientID_ );
+      p = new Chat( data, clientID );
       break;
     case ENUM::ClassID:
-      packetContent_ = new ClassID( data, clientID_ );
+      p = new ClassID( data, clientID );
       break;
     case ENUM::Gamestate:
       // TODO: remove brackets
-      packetContent_ = new Gamestate( data, true, clientID_ );
+      p = new Gamestate( data, true, clientID );
       break;
+    case ENUM::Welcome:
+      p = new Welcome( data, clientID );
     default:
       assert(0); //TODO: repair this
       break;
   }
-  return packetContent_;
+  return p;
+}
+
+void Packet::deletePacket(ENetPacket *packet){
+  assert(packetMap_[packet]);
+  delete packetMap_[packet];
 }