[certi-cvs] certi libCERTI/Message_W.cc libCERTI/Message

certi-cvs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] certi libCERTI/Message_W.cc libCERTI/Message_R....

From:	certi-cvs
Subject:	[certi-cvs] certi libCERTI/Message_W.cc libCERTI/Message_R....
Date:	Sun, 07 Feb 2010 00:19:12 +0000

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/02/07 00:19:12

Modified files:
        libCERTI       : Message_W.cc Message_R.cc 
        RTIG           : Federation.hh 

Log message:
        Merge in patch from Andrej 
        in order to ease testing of certi java bindings

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.41&r2=3.42
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.38&r2=3.39
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.hh?cvsroot=certi&r1=3.62&r2=3.63

Patches:
Index: libCERTI/Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.41
retrieving revision 3.42
diff -u -b -r3.41 -r3.42
--- libCERTI/Message_W.cc       18 Jan 2010 09:41:30 -0000      3.41
+++ libCERTI/Message_W.cc       7 Feb 2010 00:19:12 -0000       3.42
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Message_W.cc,v 3.41 2010/01/18 09:41:30 gotthardp Exp $
+// $Id: Message_W.cc,v 3.42 2010/02/07 00:19:12 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -327,9 +327,9 @@
           case UPDATE_ATTRIBUTE_VALUES:
           case REFLECT_ATTRIBUTE_VALUES:
             msgBuffer.write_int64(objectClass);
-            msgBuffer.write_int16(handleArraySize);
             msgBuffer.write_int64(object);
             msgBuffer.write_string(tag);
+            msgBuffer.write_int16(handleArraySize);
             writeHandleArray(msgBuffer);
             writeValueArray(msgBuffer);
             writeResignAction(msgBuffer);
@@ -404,8 +404,8 @@
           case SEND_INTERACTION:
           case RECEIVE_INTERACTION:
             msgBuffer.write_int64(interactionClass);
-            msgBuffer.write_int16(handleArraySize);
             msgBuffer.write_string(tag);
+            msgBuffer.write_int16(handleArraySize);
             writeHandleArray(msgBuffer);
             writeValueArray(msgBuffer);
            msgBuffer.write_int64(region);
@@ -426,10 +426,10 @@
           // Body contains handleArraySize,transport,order,object,HandleArray
           case CHANGE_ATTRIBUTE_TRANSPORTATION_TYPE:
           case CHANGE_ATTRIBUTE_ORDER_TYPE:
-            msgBuffer.write_int16(handleArraySize);
             msgBuffer.write_int64(transport);
             msgBuffer.write_int64(order);           
             msgBuffer.write_int64(object);
+            msgBuffer.write_int16(handleArraySize);
             writeHandleArray(msgBuffer);
             break ;
 
@@ -580,7 +580,7 @@
 void
 Message::writeResignAction(MessageBuffer &msgBuffer)
 {
-    //assert(false);
+   msgBuffer.write_int32(0);
 }
 
 // ---------------------------------------------------------------
@@ -609,4 +609,4 @@
 
 } // namespace certi
 
-// $Id: Message_W.cc,v 3.41 2010/01/18 09:41:30 gotthardp Exp $
+// $Id: Message_W.cc,v 3.42 2010/02/07 00:19:12 erk Exp $

Index: libCERTI/Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.38
retrieving revision 3.39
diff -u -b -r3.38 -r3.39
--- libCERTI/Message_R.cc       18 Jan 2010 09:41:30 -0000      3.38
+++ libCERTI/Message_R.cc       7 Feb 2010 00:19:12 -0000       3.39
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Message_R.cc,v 3.38 2010/01/18 09:41:30 gotthardp Exp $
+// $Id: Message_R.cc,v 3.39 2010/02/07 00:19:12 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -312,9 +312,9 @@
           case UPDATE_ATTRIBUTE_VALUES:
           case REFLECT_ATTRIBUTE_VALUES:
             objectClass = msgBuffer.read_int64();
-            handleArraySize = msgBuffer.read_int16();
             object = msgBuffer.read_int64();
             readTag(msgBuffer);
+            handleArraySize = msgBuffer.read_int16();
             readHandleArray(msgBuffer);
             readValueArray(msgBuffer);
             readResignAction(msgBuffer);
@@ -388,8 +388,8 @@
             // valueArray,region,resignAction,boolean
             // boolean true means with time, false without time
             interactionClass = msgBuffer.read_int64();
-            handleArraySize = msgBuffer.read_int16();
             readTag(msgBuffer);
+            handleArraySize = msgBuffer.read_int16();
             readHandleArray(msgBuffer);
             readValueArray(msgBuffer);
            region = msgBuffer.read_int64();
@@ -410,10 +410,10 @@
           // Body contains handleArraySize,transport,order,object,HandleArray
           case CHANGE_ATTRIBUTE_TRANSPORTATION_TYPE:
           case CHANGE_ATTRIBUTE_ORDER_TYPE:
-            handleArraySize = msgBuffer.read_int64();
             transport = msgBuffer.read_int64();
             order = msgBuffer.read_int64();
             object = msgBuffer.read_int64();
+            handleArraySize = msgBuffer.read_int16();
             readHandleArray(msgBuffer);
             break ;
 
@@ -610,6 +610,7 @@
 void
 Message::readResignAction(MessageBuffer &msgBuffer)
 {
+   msgBuffer.read_int32();
     // BUG: Should do something.
 }
 
@@ -649,4 +650,4 @@
 
 } // namespace certi
 
-// $Id: Message_R.cc,v 3.38 2010/01/18 09:41:30 gotthardp Exp $
+// $Id: Message_R.cc,v 3.39 2010/02/07 00:19:12 erk Exp $

Index: RTIG/Federation.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.hh,v
retrieving revision 3.62
retrieving revision 3.63
diff -u -b -r3.62 -r3.63
--- RTIG/Federation.hh  24 Nov 2009 21:44:47 -0000      3.62
+++ RTIG/Federation.hh  7 Feb 2010 00:19:12 -0000       3.63
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: Federation.hh,v 3.62 2009/11/24 21:44:47 erk Exp $
+// $Id: Federation.hh,v 3.63 2010/02/07 00:19:12 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef _CERTI_RTIG_FEDERATION_HH
@@ -31,6 +31,7 @@
 #include "SecurityServer.hh"
 #include "HandleManager.hh"
 #include "certi.hh"
+#include <stdlib.h>
 
 #ifdef FEDERATION_USES_MULTICAST
 #include "SocketMC.hh"
@@ -682,4 +683,4 @@
 
 #endif // _CERTI_RTIG_FEDERATION_HH
 
-// $Id: Federation.hh,v 3.62 2009/11/24 21:44:47 erk Exp $
+// $Id: Federation.hh,v 3.63 2010/02/07 00:19:12 erk Exp $

[Prev in Thread]

Current Thread

[Next in Thread]

[certi-cvs] certi libCERTI/Message_W.cc libCERTI/Message_R...., certi-cvs <=

Prev by Date: [certi-cvs] applications/HLA_TestsSuite dtest_Interactive_F...
Next by Date: [certi-cvs] applications/HLA_TestsSuite portico-testfom.fed
Previous by thread: [certi-cvs] applications/HLA_TestsSuite dtest_Interactive_F...
Next by thread: [certi-cvs] applications/HLA_TestsSuite portico-testfom.fed
Index(es):
- Date
- Thread