Changeset 1710

Timestamp:

Sep 5, 2008, 12:27:37 PM (16 years ago)

Author:

scheusso

Message:

further errors corrected (mostly double frees, etc)

Location:

code/branches/network/src/network

Files:

• Client.cc (modified) (3 diffs)
• ConnectionManager.cc (modified) (1 diff)
• GamestateHandler.h (modified) (1 diff)
• Server.cc (modified) (4 diffs)
• packet/Gamestate.cc (modified) (1 diff)
• packet/Gamestate.h (modified) (2 diffs)
• packet/Packet.cc (modified) (3 diffs)

code/branches/network/src/network/Client.cc

@@ -155 +155 @@
       if(gs){
         COUT(4) << "client tick: sending gs " << gs << std::endl;
-        packet::Packet p(gs);
-        if( !p.send() )
+        packet::Packet packet(gs);
+        if( !packet.send() )
           COUT(3) << "Problem adding partial gamestate to queue" << std::endl;
         // now delete it to save memory
@@ -173 +173 @@
     if(gameStateID==GAMESTATEID_INITIAL)
       if(gameStateFailure_){
-        packet::Packet packet(new packet::Acknowledgement(GAMESTATEID_INITIAL, 0));
+        packet::Acknowledgement ack(GAMESTATEID_INITIAL, 0);
+        packet::Packet packet(&ack);
         if(!packet.send())
           COUT(3) << "could not (negatively) ack gamestate" << std::endl;
@@ -186 +187 @@
         isSynched_=true;
       gameStateFailure_=false;
-      packet::Packet packet(new packet::Acknowledgement(gameStateID, 0));
+      packet::Acknowledgement ack(gameStateID, 0);
+      packet::Packet packet(&ack);
       if(!packet.send())
         COUT(3) << "could not ack gamestate" << std::endl;

code/branches/network/src/network/ConnectionManager.cc

@@ -360 +360 @@
       ++it;
     }
-    packet.setPacketContent(0);
     //sendPackets();
     COUT(4) << "syncClassid:\tall synchClassID packets have been sent" << std::endl;

code/branches/network/src/network/GamestateHandler.h

@@ -52 +52 @@
     
   public:
-    static bool addGamestate(packet::Gamestate *gs, int clientID){ return instance_->addGamestate(gs, clientID); }
+    static bool addGamestate(packet::Gamestate *gs, int clientID){ return instance_->add(gs, clientID); }
     static bool ackGamestate(int gamestateID, int clientID){ return instance_->ack(gamestateID, clientID); }
 };

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

@@ -121 +121 @@
       if(!pkt->send())
         COUT(3) << "could not send Chat message to client ID: " << temp->getID() << std::endl;
+      delete pkt;
     }
     return message->process();
@@ -140 +141 @@
         COUT(3) << "could not send Chat message to client ID: " << temp->getID() << std::endl;
     }
-    return chat->process();
+    return chat->process();;
   }
 
@@ -269 +270 @@
       added=true;
       temp=temp->next();
-      // now delete gamestate
       delete gs;
     }
@@ -323 +323 @@
     temp->setSynched(true);
     COUT(3) << "sending welcome" << std::endl;
-    packet::Packet packet(new packet::Welcome(temp->getID(), temp->getShipID()));
+    packet::Welcome *w = new packet::Welcome(temp->getID(), temp->getShipID());
+    packet::Packet packet(w);
     assert(packet.send());
+    delete w;
     return true;
   }

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

@@ -80 +80 @@
   
   //start write gamestate header
+  HEADER->packetType = ENUM::Gamestate;
   HEADER->normsize = currentsize;
   HEADER->id = id;

code/branches/network/src/network/packet/Gamestate.h

@@ -28 +28 @@
 
 #include "PacketContent.h"
+#include "Packet.h"
 #include "network/Synchronisable.h"
 //#include "util/Bytestream.h"
@@ -40 +41 @@
   
 struct GamestateHeader{
+  ENUM::Type packetType;
   int id; // id of the gamestate
   unsigned int compsize;

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

@@ -41 +41 @@
   packetContent_ = createPacketContent(packet);
   enet_packet_destroy(packet);
-  delete peer;
 }
 
 Packet::~Packet(){
-  if(packetContent_)
-    delete packetContent_;
   if(enetPacket_){
     enet_packet_destroy(enetPacket_);
@@ -66 +63 @@
     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());
   }
@@ -92 +88 @@
       break;
     default:
-      assert(0);
+      assert(0); //TODO: repair this
+      break;
   }
   return packetContent_;