Changeset 1739 for code/branches/network/src/network/packet

Timestamp:

Sep 8, 2008, 1:36:32 AM (16 years ago)

Author:

scheusso

Message:

further fixes (diff/undiff not working yet)

Location:

code/branches/network/src/network/packet

Files:

• Acknowledgement.cc (modified) (1 diff)
• Gamestate.cc (modified) (5 diffs)
• Gamestate.h (modified) (1 diff)
• Packet.cc (modified) (2 diffs)
• Packet.h (modified) (1 diff)

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

@@ -45 +45 @@
   data_=new unsigned char[ getSize() ];
   *(ENUM::Type *)(data_ + _PACKETID ) = ENUM::Acknowledgement;
-  *(unsigned int *)&data_[ _ACKID ] = id;
+  *(unsigned int *)(data_ + _ACKID ) = id;
   clientID_=clientID;
 }

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

@@ -120 +120 @@
 bool Gamestate::spreadData(int mode)
 {
-  assert(data_ && !HEADER->compressed && !HEADER->diffed);
+  assert(data_);
+  assert(!HEADER->compressed);
+  assert(!HEADER->diffed);
   unsigned int size, objectID, classID;
   unsigned char *mem=data_+sizeof(GamestateHeader);
@@ -141 +143 @@
         //fabricate the new synchronisable
         if(!Synchronisable::fabricate(mem, mode))
-          /*return false*/;
+          return false;
         it=orxonox::ObjectList<Synchronisable>::end();
       }
@@ -276 +278 @@
   *GAMESTATE_HEADER(ndata) = *HEADER;
   GAMESTATE_HEADER(ndata)->diffed = true;
+  GAMESTATE_HEADER(ndata)->base_id = base->getID();
   Gamestate *g = new Gamestate(ndata, 0);
+  g->flags_=flags_;
+  g->packetDirection_ = packetDirection_;
+  g->clientID_ = clientID_;
   return g;
 }
@@ -310 +316 @@
   GAMESTATE_HEADER(ndata)->diffed = false;
   Gamestate *g = new Gamestate(ndata, 0);
+  g->flags_=flags_;
+  g->packetDirection_ = packetDirection_;
+  g->clientID_ = clientID_;
+  assert(!g->isDiffed());
+  assert(!g->isCompressed());
   return g;
 }
@@ -341 +352 @@
   }
   
+  bool Gamestate::isCompressed(){
+    return HEADER->compressed;
+  }
+  
   int Gamestate::getBaseID(){
     return HEADER->base_id;

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

@@ -64 +64 @@
     int getID();
     bool isDiffed();
+    bool isCompressed();
     int getBaseID();
     Gamestate *diff(Gamestate *base);

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

@@ -113 +113 @@
     packetMap_[enetPacket_] = this;
   }
-  /*switch( *(ENUM::Type *)(data_ + _PACKETID) )
+#ifndef NDEBUG
+  switch( *(ENUM::Type *)(data_ + _PACKETID) )
   {
     case ENUM::Acknowledgement:
@@ -120 +121 @@
     case ENUM::Gamestate:
     case ENUM::Welcome:
-      COUT(3) << "welcome" << std::endl;
-      p = new Welcome( data, clientID );
+      break;
     default:
       assert(0); //TODO: repair this
       break;
-  }*/
+  }
+#endif
   network::Host::addPacket( enetPacket_, clientID_);
   enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet

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

@@ -78 +78 @@
     enet_uint32 flags_;
     int clientID_;
+    ENUM::Direction packetDirection_;
     unsigned char *data_;
   private:
     static std::map<ENetPacket *, Packet *> packetMap_;
     ENetPacket *enetPacket_;
-    ENUM::Direction packetDirection_;
 };