Changeset 2316 for code

Timestamp:

Dec 3, 2008, 2:07:32 PM (16 years ago)

Author:

scheusso

Message:

endianness test

Location:

code/branches/network64/src/network

Files:

• packet/Welcome.cc (modified) (4 diffs)
• synchronisable/Synchronisable.cc (modified) (1 diff)

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

@@ -43 +43 @@
 #define _CLIENTID             _PACKETID + sizeof(ENUM::Type)
 #define _SHIPID               _CLIENTID + sizeof(uint32_t)
+#define _ENDIANTEST           _SHIPID + sizeof(uint32_t)
   
   Welcome::Welcome( unsigned int clientID, unsigned int shipID )
@@ -52 +53 @@
   assert(data_);
   *(packet::ENUM::Type *)(data_ + _PACKETID ) = packet::ENUM::Welcome;
-  *(uint32_t *)&data_[ _CLIENTID ] = clientID;
-  *(uint32_t *)&data_[ _SHIPID ] = shipID;
+  *(uint32_t *)(data_ + _CLIENTID ) = clientID;
+  *(uint32_t *)(data_ + _SHIPID ) = shipID;
+  *(uint32_t *)(data_ + _ENDIANTEST ) = 0xFEDC4321;
 }
 
@@ -70 +72 @@
 
 unsigned int Welcome::getSize() const{
-  return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t);
+  return sizeof(packet::ENUM::Type) + 3*sizeof(uint32_t);
 }
 
@@ -77 +79 @@
   clientID = *(uint32_t *)&data_[ _CLIENTID ];
   shipID = *(uint32_t *)&data_[ _SHIPID ];
+  assert(*(uint32_t *)(data_ + _ENDIANTEST ) == 0xFEDC4321);
   Host::setClientID(clientID);
   Host::setShipID(shipID);

code/branches/network64/src/network/synchronisable/Synchronisable.cc

@@ -303 +303 @@
     //std::cout << "inside getData" << std::endl;
     uint32_t tempsize = 0;
-    if(classID==0)
+    if (this->classID==0)
       COUT(3) << "classid 0 " << this->getIdentifier()->getName() << std::endl;