Changeset 1713 for code/branches/network/src

Timestamp:

Sep 6, 2008, 2:50:12 PM (16 years ago)

Author:

scheusso

Message:

some bugs fixed (packet handling)

Location:

code/branches/network/src/network

Files:

• ConnectionManager.cc (modified) (2 diffs)
• ConnectionManager.h (modified) (1 diff)
• packet/Acknowledgement.cc (modified) (1 diff)
• packet/ClassID.cc (modified) (2 diffs)
• packet/Gamestate.cc (modified) (1 diff)
• packet/Packet.cc (modified) (4 diffs)
• packet/Packet.h (modified) (1 diff)
• packet/Welcome.cc (modified) (1 diff)

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

@@ -334 +334 @@
   }
 
-  void ConnectionManager::syncClassid(int clientID) {
+  /**
+   * 
+   * @param clientID 
+   */
+  void ConnectionManager::syncClassid(unsigned int clientID) {
     unsigned int network_id=0, failures=0;
     std::string classname;
@@ -349 +353 @@
       COUT(4) << "Con.Man:syncClassid:\tnetwork_id: " << network_id << ", classname: " << classname << std::endl;
 
-      packet::ClassID classid( network_id, classname );
-      classid.setClientID(clientID);
-      while(!classid.send() && failures < 10){
+      packet::ClassID *classid = new packet::ClassID( network_id, classname );
+      classid->setClientID(clientID);
+      while(!classid->send() && failures < 10){
         failures++;
       }

code/branches/network/src/network/ConnectionManager.h

@@ -94 +94 @@
     //bool createClient(int clientID);
     void disconnectClient(ClientInformation *client);
-    void syncClassid(int clientID);
+    void syncClassid(unsigned int clientID);
 
   private:

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

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

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

@@ -51 +51 @@
   data_=new unsigned char[ getSize() ];
   assert(data_);
-  *(ENUM::Type *)&data_[ _PACKETID ] = ENUM::ClassID;
-  *(unsigned int *)&data_[ _CLASSID ] = classID;
-  *(unsigned int *)&data_[ _CLASSNAMELENGTH ] = classNameLength_;
-  memcpy( &data_[ _CLASSNAME ], (void *)className.c_str(), classNameLength_ );
+  *(ENUM::Type *)(data_ + _PACKETID ) = ENUM::ClassID;
+  *(unsigned int *)(data_ + _CLASSID ) = classID;
+  *(unsigned int *)(data_ + _CLASSNAMELENGTH ) = classNameLength_;
+  memcpy( data_+_CLASSNAME, (void *)className.c_str(), classNameLength_ );
 }
 
@@ -72 +72 @@
 
 bool ClassID::process(){
+  COUT(3) << "processing classid: " << getClassID() << " name: " << &data_[ sizeof(network::packet::ENUM::Type) ] << std::endl;
   orxonox::Identifier *id=ID( std::string((const char*)&data_[ sizeof(network::packet::ENUM::Type) ]) );
   if(id==NULL)

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

@@ -106 +106 @@
   //start write gamestate header
   HEADER->packetType = ENUM::Gamestate;
-  assert( *(ENUM::Type *)&data_[ 0 ] == ENUM::Gamestate);
+  assert( *(ENUM::Type *)&data_[ 0 ] == ENUM::Gamestate); 
   HEADER->normsize = currentsize;
   HEADER->id = id;

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

@@ -61 +61 @@
 
 void blub(ENetPacket *packet){
-  COUT(0) << "blubb" << std::endl;
+  COUT(4) << "blubb" << std::endl;
 }
 
 Packet::Packet(unsigned char *data, int clientID){
   flags_ = PACKET_FLAG_DEFAULT;
-  packetDirection_ = ENUM::Outgoing;
+  packetDirection_ = ENUM::Incoming;
   clientID_=clientID;
   data_=data;
@@ -72 +72 @@
 }
 
-Packet::Packet(ENetPacket *packet, ENetPeer *peer){
+/*Packet::Packet(ENetPacket *packet, ENetPeer *peer){
   packetDirection_ = ENUM::Incoming;
   enetPacket_ = packet;
   clientID_ = ClientInformation::findClient(&peer->address)->getID();
   data_ = packet->data;
-}
+}*/
 
 Packet::Packet(const Packet &p){
@@ -107 +107 @@
     }
     enetPacket_ = enet_packet_create(getData(), getSize(), getFlags());
+    //enetPacket_->freeCallback = &Packet::deletePacket;
     enetPacket_->freeCallback = &blub;
     packetMap_[enetPacket_] = this;
@@ -119 +120 @@
   unsigned int clientID = ClientInformation::findClient(&peer->address)->getID();
   Packet *p;
+  COUT(3) << "packet type: " << *(ENUM::Type *)&data[_PACKETID] << std::endl;
   switch( *(ENUM::Type *)&data[_PACKETID] )
   {
     case ENUM::Acknowledgement:
+      COUT(3) << "ack" << std::endl;
       p = new Acknowledgement( data, clientID );
       break;
     case ENUM::Chat:
+      COUT(3) << "chat" << std::endl;
       p = new Chat( data, clientID );
       break;
     case ENUM::ClassID:
+      COUT(3) << "classid" << std::endl;
       p = new ClassID( data, clientID );
       break;
     case ENUM::Gamestate:
+      COUT(3) << "gamestate" << std::endl;
       // TODO: remove brackets
       p = new Gamestate( data, true, clientID );
       break;
     case ENUM::Welcome:
+      COUT(3) << "welcome" << std::endl;
       p = new Welcome( data, clientID );
     default:

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

@@ -75 +75 @@
     Packet();
     Packet(unsigned char *data, int clientID);
-    Packet(ENetPacket *packet, ENetPeer *peer);
+//    Packet(ENetPacket *packet, ENetPeer *peer);
     enet_uint32 flags_;
     int clientID_;

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

@@ -49 +49 @@
   data_=new unsigned char[ getSize() ];
   assert(data_);
-  *(packet::ENUM::Type *)&data_[ _PACKETID ] = packet::ENUM::Welcome;
+  *(packet::ENUM::Type *)(data_ + _PACKETID ) = packet::ENUM::Welcome;
   *(unsigned int *)&data_[ _CLIENTID ] = clientID;
   *(unsigned int *)&data_[ _SHIPID ] = shipID;