Changeset 7011 for code/branches

Timestamp:

May 30, 2010, 12:26:27 PM (14 years ago)

Author:

scheusso

Message:

merged a fix from presentation3 in order to be able to test with network

Location:

code/branches/rocket2

Files:

• . (modified) (1 prop)
• src/libraries/network/packet/ClassID.cc (modified) (4 diffs)

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

@@ -65 +65 @@
     tempQueue.push( std::pair<unsigned int, std::string>(network_id, classname) );
     ++nrOfClasses;
-    packetSize += (classname.size()+1)+sizeof(uint32_t)+sizeof(uint32_t);
+    packetSize += (classname.size()+1)+sizeof(network_id)+sizeof(uint32_t);
   }
 
@@ -80 +80 @@
   // now save all classids and classnames
   std::pair<uint32_t, std::string> tempPair;
+  uint32_t tempsize = 2*sizeof(uint32_t); // packetid and nrOfClasses
   while( !tempQueue.empty() ){
     tempPair = tempQueue.front();
@@ -87 +88 @@
     memcpy(temp+2*sizeof(uint32_t), tempPair.second.c_str(), tempPair.second.size()+1);
     temp+=2*sizeof(uint32_t)+tempPair.second.size()+1;
+    tempsize+=2*sizeof(uint32_t)+tempPair.second.size()+1;
   }
+  assert(tempsize=packetSize);
 
   COUT(5) << "classid packetSize is " << packetSize << endl;
@@ -111 +114 @@
   for(unsigned int i=0; i<nrOfClasses; i++){
     totalsize += 2*sizeof(uint32_t) + *(uint32_t*)(temp + sizeof(uint32_t));
+    temp += 2*sizeof(uint32_t) + *(uint32_t*)(temp + sizeof(uint32_t));
   }
   return totalsize;