Changeset 2944 for code/branches/netp2/src/network/packet

Timestamp:

May 1, 2009, 9:47:34 AM (16 years ago)

Author:

scheusso

Message:

this is another commit for testing purpose
still trying to get network function calls to work (first success)

Location:

code/branches/netp2/src/network/packet

Files:

• FunctionCalls.cc (modified) (8 diffs)
• Packet.cc (modified) (2 diffs)

code/branches/netp2/src/network/packet/FunctionCalls.cc

@@ -72 +72 @@
   {
     uint32_t functionID = *(uint32_t*)temp;
-    bool isStatic = NetworkFunctionBase::isStatic( functionID );
+    bool isStatic = *(uint8_t*)(temp+sizeof(uint32_t));
     if( isStatic )
     {
       MultiType mt1, mt2, mt3, mt4, mt5;
       NetworkFunctionStatic *fct = NetworkFunctionStatic::getFunction( functionID );
-      uint32_t nrOfArguments = *(uint32_t*)(temp+sizeof(uint32_t));
-      temp+=2*sizeof(uint32_t);
+      uint32_t nrOfArguments = *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t));
+      temp+=2*sizeof(uint32_t)+sizeof(uint8_t);
       switch(nrOfArguments)
       {
@@ -122 +122 @@
       MultiType mt1, mt2, mt3, mt4, mt5;
       NetworkMemberFunctionBase *fct = NetworkMemberFunctionBase::getFunction( functionID );
-      uint32_t nrOfArguments = *(uint32_t*)(temp+sizeof(uint32_t));
-      uint32_t objectID = *(uint32_t*)(temp+2*sizeof(uint32_t));
-      temp+=3*sizeof(uint32_t);
+      uint32_t nrOfArguments = *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t));
+      uint32_t objectID = *(uint32_t*)(temp+2*sizeof(uint32_t)+sizeof(uint8_t));
+      temp+=3*sizeof(uint32_t)+sizeof(uint8_t);
       switch(nrOfArguments)
       {
@@ -166 +166 @@
     }
   }
+  delete this;
   return true;
 }
@@ -173 +174 @@
   
   // first determine the size that has to be reserved for this call
-  uint32_t callsize = 2*sizeof(uint32_t); //size for network-function-id and nrOfArguments
+  uint32_t callsize = 2*sizeof(uint32_t)+sizeof(uint8_t); //size for network-function-id and nrOfArguments and for bool isStatic
   uint32_t nrOfArguments = 0;
   if(mt1)
@@ -211 +212 @@
   }
   
-  // now serialise the mt values and copy the function id
+  // now serialise the mt values and copy the function id and isStatic
   uint8_t* temp = data_+currentSize_;
   *(uint32_t*)(data_+sizeof(uint32_t)) = *(uint32_t*)(data_+sizeof(uint32_t))+1; // increase number of calls
   *(uint32_t*)temp = networkID;
-  *(uint32_t*)(temp+sizeof(uint32_t)) = nrOfArguments;
-  temp += 2*sizeof(uint32_t);
+  *(uint8_t*)(temp+sizeof(uint32_t)) = true;
+  *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t)) = nrOfArguments;
+  temp += 2*sizeof(uint32_t)+sizeof(uint8_t);
   if(mt1)
   {
@@ -237 +239 @@
     }
   }
-  currentSize_ += callsize;
+  //currentSize_ += callsize;
+  currentSize_ = temp-data_;
   
 }
@@ -245 +248 @@
   
   // first determine the size that has to be reserved for this call
-  uint32_t callsize = 3*sizeof(uint32_t); //size for network-function-id and nrOfArguments and the objectID
+  uint32_t callsize = 3*sizeof(uint32_t)+sizeof(uint8_t); //size for network-function-id and nrOfArguments and the objectID
   uint32_t nrOfArguments = 0;
   if(mt1)
@@ -287 +290 @@
   *(uint32_t*)(data_+sizeof(uint32_t)) = *(uint32_t*)(data_+sizeof(uint32_t))+1; // increase number of calls
   *(uint32_t*)temp = networkID;
-  *(uint32_t*)(temp+sizeof(uint32_t)) = nrOfArguments;
-  *(uint32_t*)(temp+2*sizeof(uint32_t)) = objectID;
-  temp += 3*sizeof(uint32_t);
+  *(uint8_t*)(temp+sizeof(uint32_t)) = false;
+  *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t)) = nrOfArguments;
+  *(uint32_t*)(temp+2*sizeof(uint32_t)+sizeof(uint8_t)) = objectID;
+  temp += 3*sizeof(uint32_t)+sizeof(uint8_t);
   if(mt1)
   {

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

@@ -39 +39 @@
 
 #include "Acknowledgement.h"
+#include "DeleteObjects.h"
 #include "Chat.h"
 #include "ClassID.h"
+#include "FunctionCalls.h"
+#include "FunctionIDs.h"
 #include "Gamestate.h"
 #include "Welcome.h"
-#include "DeleteObjects.h"
 #include "network/Host.h"
 #include "core/CoreIncludes.h"
@@ -172 +174 @@
   unsigned int clientID = ClientInformation::findClient(&peer->address)->getID();
   Packet *p = 0;
-  COUT(5) << "packet type: " << *(ENUM::Type *)&data[_PACKETID] << std::endl;
+  COUT(6) << "packet type: " << *(ENUM::Type *)&data[_PACKETID] << std::endl;
   switch( *(ENUM::Type *)(data + _PACKETID) )
   {
     case ENUM::Acknowledgement:
-      COUT(4) << "ack" << std::endl;
+      COUT(5) << "ack" << std::endl;
       p = new Acknowledgement( data, clientID );
       break;
     case ENUM::Chat:
-      COUT(4) << "chat" << std::endl;
+      COUT(5) << "chat" << std::endl;
       p = new Chat( data, clientID );
       break;
     case ENUM::ClassID:
-      COUT(4) << "classid" << std::endl;
+      COUT(5) << "classid" << std::endl;
       p = new ClassID( data, clientID );
       break;
     case ENUM::Gamestate:
-      COUT(4) << "gamestate" << std::endl;
+      COUT(5) << "gamestate" << std::endl;
       // TODO: remove brackets
       p = new Gamestate( data, clientID );
       break;
     case ENUM::Welcome:
-      COUT(4) << "welcome" << std::endl;
+      COUT(5) << "welcome" << std::endl;
       p = new Welcome( data, clientID );
       break;
     case ENUM::DeleteObjects:
-      COUT(4) << "deleteobjects" << std::endl;
+      COUT(5) << "deleteobjects" << std::endl;
       p = new DeleteObjects( data, clientID );
+      break;
+    case ENUM::FunctionCalls:
+      COUT(5) << "functionCalls" << std::endl;
+      p = new FunctionCalls( data, clientID );
+      break;
+    case ENUM::FunctionIDs:
+      COUT(5) << "functionIDs" << std::endl;
+      p = new FunctionIDs( data, clientID );
       break;
     default: