[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
certi/libCERTI Message.hh Message_R.cc Message_...
|
From: |
certi-cvs |
|
Subject: |
certi/libCERTI Message.hh Message_R.cc Message_... |
|
Date: |
Tue, 30 Oct 2007 15:24:47 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: ROUSSELOT <rousse> 07/10/30 15:24:47
Modified files:
libCERTI : Message.hh Message_R.cc Message_W.cc
Log message:
Message_R and _W.cc restructuration
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.hh?cvsroot=certi&r1=3.36&r2=3.37
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.4&r2=3.5
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.5&r2=3.6
Patches:
Index: Message.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.hh,v
retrieving revision 3.36
retrieving revision 3.37
diff -u -b -r3.36 -r3.37
--- Message.hh 26 Oct 2007 13:00:07 -0000 3.36
+++ Message.hh 30 Oct 2007 15:24:47 -0000 3.37
@@ -67,13 +67,14 @@
RegionHandle region ;
};
- union MessageHeaderUnion {
- MessageTimeStruct time ;
- MessageT_O_Struct T_O ;
- MessageJ_R_Struct J_R ;
- MessageO_I_Struct O_I ;
- Message_DDM ddm ;
- };
+ // MessageHeaderUnion deprecated
+ //union MessageHeaderUnion {
+ // MessageTimeStruct time ;
+ // MessageT_O_Struct T_O ;
+ // MessageJ_R_Struct J_R ;
+ // MessageO_I_Struct O_I ;
+ // Message_DDM ddm ;
+ //};
enum Type {
NOT_USED = 0,
@@ -241,7 +242,7 @@
TypeException exception ;
UShort bodySize ;
FederationTime date ;
- MessageHeaderUnion VP ; // Variable Part
+ //MessageHeaderUnion VP ; // Variable Part deprecated
};
public:
Index: Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -b -r3.4 -r3.5
--- Message_R.cc 30 Oct 2007 14:15:24 -0000 3.4
+++ Message_R.cc 30 Oct 2007 15:24:47 -0000 3.5
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_R.cc,v 3.4 2007/10/30 14:15:24 rousse Exp $
+// $Id: Message_R.cc,v 3.5 2007/10/30 15:24:47 rousse Exp $
// ----------------------------------------------------------------------------
@@ -47,7 +47,6 @@
}
-
// ----------------------------------------------------------------------------
//! Read a Message Body from a Socket, should be called after ReadHeader.
void
@@ -76,14 +75,13 @@
switch(header.type) {
- // --- No Variable Part, Body not empty ---
-
- // Body contains FederationName, FEDid
+ // Body contains federationName, FEDid
case CREATE_FEDERATION_EXECUTION:
readFederationName(body);
readFEDid(body) ;
break ;
+ // Body contains federationName
case DESTROY_FEDERATION_EXECUTION:
readFederationName(body);
break ;
@@ -256,8 +254,6 @@
space = body.readLongInt();
break ;
- // --- MessageJ_R_Struct --
-
// Body contains federate,Federationname,FederateName
case JOIN_FEDERATION_EXECUTION:
federate = body.readShortInt();
@@ -265,8 +261,6 @@
readFederateName(body);
break ;
- // --- MessageO_I_Struct ---
-
// federationTime got from header
// Body contains objectClass,handleArraySize,HandleArray
case PUBLISH_OBJECT_CLASS:
@@ -355,8 +349,9 @@
case SEND_INTERACTION:
case RECEIVE_INTERACTION:
- // B.c. Tag, HandleArray[], ValueArray[], RAction
- // and boolean (true means SI with time, false without time)
+ // Body contains interactionClass,handleArraySize,tag,handleArray,
+ // valueArray,region,resignAction,boolean
+ // boolean true means with time, false without time
interactionClass = body.readLongInt();
handleArraySize = body.readShortInt();
readTag(body);
@@ -377,7 +372,6 @@
parameter = body.readShortInt();
break ;
- // --- MessageT_O_Struct, body not empty ---
// Body contains handleArraySize,transport,order,object,HandleArray
case CHANGE_ATTRIBUTE_TRANSPORTATION_TYPE:
case CHANGE_ATTRIBUTE_ORDER_TYPE:
@@ -705,4 +699,4 @@
} // namespace certi
-// $Id: Message_R.cc,v 3.4 2007/10/30 14:15:24 rousse Exp $
+// $Id: Message_R.cc,v 3.5 2007/10/30 15:24:47 rousse Exp $
Index: Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -b -r3.5 -r3.6
--- Message_W.cc 30 Oct 2007 14:15:24 -0000 3.5
+++ Message_W.cc 30 Oct 2007 15:24:47 -0000 3.6
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_W.cc,v 3.5 2007/10/30 14:15:24 rousse Exp $
+// $Id: Message_W.cc,v 3.6 2007/10/30 15:24:47 rousse Exp $
// ----------------------------------------------------------------------------
@@ -74,13 +74,13 @@
// 1- Prepare Body Structure according to Message type
switch(header.type) {
- // --- No Variable Part, Body not empty ---
-
+ // Body contains federationName,FEDid
case CREATE_FEDERATION_EXECUTION:
body.writeString(federationName);
body.writeString(FEDid);
break ;
+ // Body contains federationName
case DESTROY_FEDERATION_EXECUTION:
body.writeString(federationName);
break ;
@@ -262,8 +262,6 @@
body.writeLongInt(space);
break ;
- // --- MessageJ_R_Struct --
-
// Body contains federate,federatioName,federateName
case JOIN_FEDERATION_EXECUTION:
body.writeShortInt(federate);
@@ -271,8 +269,6 @@
body.writeString(federateName);
break ;
- // --- MessageO_I_Struct ---need FederationTime into header
-
// FederationTime yet put in header
// Body contains objectClass,handleArraySize,HandleArray
case PUBLISH_OBJECT_CLASS:
@@ -385,7 +381,6 @@
body.writeShortInt(parameter);
break ;
- // --- MessageT_O_Struct, Body not empty ---
// Body contains handleArraySize,transport,order,object,HandleArray
case CHANGE_ATTRIBUTE_TRANSPORTATION_TYPE:
case CHANGE_ATTRIBUTE_ORDER_TYPE:
@@ -689,4 +684,4 @@
} // namespace certi
-// $Id: Message_W.cc,v 3.5 2007/10/30 14:15:24 rousse Exp $
+// $Id: Message_W.cc,v 3.6 2007/10/30 15:24:47 rousse Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- certi/libCERTI Message.hh Message_R.cc Message_...,
certi-cvs <=