[Orxonox-commit 24] r2737 - branches/network/src/network/packet

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-03-04 12:37:49 +0100 (Wed, 04 Mar 2009)
New Revision: 2737

Modified:
   branches/network/src/network/packet/ClassID.cc
   branches/network/src/network/packet/ClassID.h
Log:
removed some inconsistencies (data types)


Modified: branches/network/src/network/packet/ClassID.cc
===================================================================
--- branches/network/src/network/packet/ClassID.cc	2009-03-04 11:36:24 UTC (rev 2736)
+++ branches/network/src/network/packet/ClassID.cc	2009-03-04 11:37:49 UTC (rev 2737)
@@ -38,7 +38,7 @@
 
 
 
-  ClassID::ClassID( unsigned int classID, std::string className )
+  ClassID::ClassID( uint32_t classID, std::string className )
  : Packet()
 {
   flags_ = flags_ | PACKET_FLAGS_CLASSID;
@@ -47,8 +47,8 @@
   data_=new unsigned char[ getSize() ];
   assert(data_);
   *(ENUM::Type *)(data_ + _PACKETID ) = ENUM::ClassID;
-  *(unsigned int *)(data_ + _CLASSID ) = classID;
-  *(unsigned int *)(data_ + _CLASSNAMELENGTH ) = classNameLength_;
+  *(uint32_t *)(data_ + _CLASSID ) = classID;
+  *(uint32_t *)(data_ + _CLASSNAMELENGTH ) = classNameLength_;
   memcpy( data_+_CLASSNAME, (void *)className.c_str(), classNameLength_ );
 }
 
@@ -62,22 +62,21 @@
 {
 }
 
-unsigned int ClassID::getSize() const{
-  return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t) + classNameLength_;
-}
 
 bool ClassID::process(){
   COUT(3) << "processing classid: " << getClassID() << " name: " << getClassName() << std::endl;
   Identifier *id=ClassByString( std::string(getClassName()) );
-  if(id==NULL)
-    return false;
+  if(id==NULL){
+    COUT(0) << "Recieved a bad classname" << endl;
+    abort();
+  }
   id->setNetworkID( getClassID() );
   delete this;
   return true;
 }
 
 
-unsigned int ClassID::getClassID(){
+uint32_t ClassID::getClassID(){
   return *(uint32_t *)(data_ + _CLASSID);
 }
 

Modified: branches/network/src/network/packet/ClassID.h
===================================================================
--- branches/network/src/network/packet/ClassID.h	2009-03-04 11:36:24 UTC (rev 2736)
+++ branches/network/src/network/packet/ClassID.h	2009-03-04 11:37:49 UTC (rev 2737)
@@ -49,15 +49,15 @@
 class _NetworkExport ClassID : public Packet
 {
 public:
-  ClassID( unsigned int classID, std::string className );
+  ClassID( uint32_t classID, std::string className );
   ClassID( uint8_t* data, unsigned int clientID );
   ~ClassID();
 
-  inline unsigned int getSize() const;
+  inline uint32_t getSize() const{ return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t) + classNameLength_; }
   bool process();
 
-  unsigned int getClassID();
-  unsigned int getClassNameLength(){ return classNameLength_; }
+  uint32_t getClassID();
+  uint32_t getClassNameLength(){ return classNameLength_; }
   const char *getClassName(){ return (const char*)(data_+_CLASSNAME); }
 private:
   uint32_t classNameLength_;