[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
certi/libCERTI Message_R.cc Message_W.cc
|
From: |
certi-cvs |
|
Subject: |
certi/libCERTI Message_R.cc Message_W.cc |
|
Date: |
Tue, 30 Oct 2007 09:25:55 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: ROUSSELOT <rousse> 07/10/30 09:25:55
Modified files:
libCERTI : Message_R.cc Message_W.cc
Log message:
Message_R and W.cc restructuration (continued)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.2&r2=3.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.2&r2=3.3
Patches:
Index: Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -b -r3.2 -r3.3
--- Message_R.cc 26 Oct 2007 14:36:29 -0000 3.2
+++ Message_R.cc 30 Oct 2007 09:25:55 -0000 3.3
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_R.cc,v 3.2 2007/10/26 14:36:29 rousse Exp $
+// $Id: Message_R.cc,v 3.3 2007/10/30 09:25:55 rousse Exp $
// ----------------------------------------------------------------------------
@@ -245,6 +245,7 @@
boolean = body.readLongInt();
break ;
+ // Body contains objectClass,attribute,space
case GET_ATTRIBUTE_SPACE_HANDLE:
objectClass = body.readLongInt();
attribute = body.readLongInt();
@@ -258,6 +259,7 @@
region = body.readLongInt();
break ;
+ // Body contains interactionClass,space
case GET_INTERACTION_SPACE_HANDLE:
interactionClass = body.readLongInt();
space = body.readLongInt();
@@ -345,12 +347,14 @@
attribute = body.readShortInt();
break ;
+ // Body contains name,space
case GET_SPACE_HANDLE:
case GET_SPACE_NAME:
this->readName(body);
this->space = body.readLongInt();
break ;
+ // Body contains name,dimension,space
case GET_DIMENSION_HANDLE:
case GET_DIMENSION_NAME:
this->readName(body);
@@ -372,11 +376,11 @@
boolean = body.readLongInt();
break ;
+ // Body contains interactionClass,name,parameter
case GET_INTERACTION_CLASS_HANDLE:
case GET_INTERACTION_CLASS_NAME:
case GET_PARAMETER_HANDLE:
case GET_PARAMETER_NAME:
- // body contains Name and ParamHandle
interactionClass = body.readLongInt();
readName(body);
parameter = body.readShortInt();
@@ -412,7 +416,7 @@
region = body.readLongInt();
break ;
-
+ // Body contains object,name
case GET_OBJECT_INSTANCE_HANDLE:
case GET_OBJECT_INSTANCE_NAME:
object = body.readLongInt();
@@ -534,8 +538,9 @@
// handleArray
// Body contains object,handleArraySize,handleArray
case CONFIRM_ATTRIBUTE_OWNERSHIP_ACQUISITION_CANCELLATION:
+ // Body contains objectClass,attribute,space
case GET_ATTRIBUTE_SPACE_HANDLE:
- case GET_INTERACTION_SPACE_HANDLE:
+ case GET_INTERACTION_SPACE_HANDLE: //Body contains interactionClass,space
case DDM_CREATE_REGION: // Body contains space,number,region
case REQUEST_FEDERATION_RESTORE: // Body contains label.
case REQUEST_FEDERATION_RESTORE_SUCCEEDED: // Body contains label.
@@ -648,22 +653,23 @@
break ;
// FederationTime yet got from header
- case GET_INTERACTION_CLASS_HANDLE: // Body contains Name
- case GET_INTERACTION_CLASS_NAME: // Body contains Name
- case GET_PARAMETER_HANDLE: // Body contains Name and parameter
- case GET_PARAMETER_NAME: // Body contains Name and parameter
- // interactionClass = header.VP.O_I.handle ;
- // handleArraySize = header.VP.O_I.size ;
- // setFederationTime(header.VP.O_I.date );
+ // Body contains interactionClass,name,parameter
+ case GET_INTERACTION_CLASS_HANDLE:
+ case GET_INTERACTION_CLASS_NAME:
+ case GET_PARAMETER_HANDLE:
+ case GET_PARAMETER_NAME:
break ;
+ // FederationTime yet got from header
+ // Body contains name,space
case GET_SPACE_HANDLE:
case GET_SPACE_NAME:
+ break ;
+
+ // FederationTime yet got from header
+ // Body contains name,dimension,space
case GET_DIMENSION_NAME:
case GET_DIMENSION_HANDLE:
- this->space = header.VP.O_I.handle ;
- handleArraySize = header.VP.O_I.size ;
- setFederationTime(header.VP.O_I.date );
break ;
// Body contains interactionClass,transport,order
@@ -715,11 +721,11 @@
case TICK_REQUEST:
break ;
+
+ // FederationTime yet got from header
+ // Body contains object,name
case GET_OBJECT_INSTANCE_HANDLE:
case GET_OBJECT_INSTANCE_NAME:
- object = header.VP.O_I.handle;
- handleArraySize = header.VP.O_I.size ;
- setFederationTime(header.VP.O_I.date);
break ;
// Body contains object,federationName,federate,handleArraySize,
@@ -823,4 +829,4 @@
} // namespace certi
-// $Id: Message_R.cc,v 3.2 2007/10/26 14:36:29 rousse Exp $
+// $Id: Message_R.cc,v 3.3 2007/10/30 09:25:55 rousse Exp $
Index: Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -b -r3.2 -r3.3
--- Message_W.cc 26 Oct 2007 14:36:29 -0000 3.2
+++ Message_W.cc 30 Oct 2007 09:25:55 -0000 3.3
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_W.cc,v 3.2 2007/10/26 14:36:29 rousse Exp $
+// $Id: Message_W.cc,v 3.3 2007/10/30 09:25:55 rousse Exp $
// ----------------------------------------------------------------------------
@@ -249,6 +249,7 @@
body.writeLongInt(boolean);
break ;
+ // Body contains objectClass,attribute,space
case GET_ATTRIBUTE_SPACE_HANDLE:
body.writeLongInt(objectClass);
body.writeLongInt(attribute);
@@ -262,6 +263,7 @@
body.writeLongInt(region);
break ;
+ // Body contains interactionClass,space
case GET_INTERACTION_SPACE_HANDLE:
body.writeLongInt(interactionClass);
body.writeLongInt(space);
@@ -350,12 +352,14 @@
body.writeShortInt(attribute);
break ;
+ // Body contains name,space
case GET_SPACE_HANDLE:
case GET_SPACE_NAME:
body.writeString(name);
body.writeLongInt(space);
break ;
+ // Body contains name,dimension,space
case GET_DIMENSION_HANDLE:
case GET_DIMENSION_NAME:
body.writeString(name);
@@ -378,11 +382,11 @@
body.writeLongInt(boolean);
break ;
+ // Body contains interactionClass,name,parameter
case GET_INTERACTION_CLASS_HANDLE:
case GET_INTERACTION_CLASS_NAME:
case GET_PARAMETER_HANDLE:
case GET_PARAMETER_NAME:
- // Body contains name and parameter
body.writeLongInt(interactionClass);
body.writeString(name);
body.writeShortInt(parameter);
@@ -418,6 +422,7 @@
body.writeLongInt(region);
break ;
+ // Body contains object,name
case GET_OBJECT_INSTANCE_HANDLE:
case GET_OBJECT_INSTANCE_NAME :
body.writeLongInt(object);
@@ -556,8 +561,9 @@
// handleArray
// Body contains object,handleArraySize,handleArray
case CONFIRM_ATTRIBUTE_OWNERSHIP_ACQUISITION_CANCELLATION:
+ // Body contains objectClass,attribute,space
case GET_ATTRIBUTE_SPACE_HANDLE:
- case GET_INTERACTION_SPACE_HANDLE:
+ case GET_INTERACTION_SPACE_HANDLE: //Body contains interactionClass,space
case INITIATE_FEDERATE_SAVE: // Body contains label
case DDM_CREATE_REGION: // Body contains space,number,region
// Body contains object,region,boolean,handleArraySize,handleArray
@@ -728,26 +734,26 @@
header.bodySize = 1 ;
break ;
- // B.c. Tag, handleArray[],
- // ValueArray[], resignAction
// FederationTime yet put in header
- case GET_INTERACTION_CLASS_HANDLE: // Body contains name
- case GET_INTERACTION_CLASS_NAME: // Body contains name
- case GET_PARAMETER_HANDLE: // Body contains name and parameter
- case GET_PARAMETER_NAME: // Body contains name and parameter
- // header.VP.O_I.handle = interactionClass ;
- // header.VP.O_I.size = handleArraySize ;
- // header.VP.O_I.date = getFederationTime() ;
+ // Body contains interactionClass,name,parameter
+ case GET_INTERACTION_CLASS_HANDLE:
+ case GET_INTERACTION_CLASS_NAME:
+ case GET_PARAMETER_HANDLE:
+ case GET_PARAMETER_NAME:
header.bodySize = 1 ;
break ;
+ // FederationTime yet put in header
+ // Body contains name,space
case GET_SPACE_HANDLE:
case GET_SPACE_NAME:
+ header.bodySize = 1 ;
+ break ;
+
+ // FederationTime yet put in header
+ // Body contains name,dimension,space
case GET_DIMENSION_HANDLE:
case GET_DIMENSION_NAME:
- header.VP.O_I.handle = space ;
- header.VP.O_I.size = handleArraySize ;
- header.VP.O_I.date = getFederationTime() ;
header.bodySize = 1 ;
break ;
@@ -808,11 +814,10 @@
header.bodySize = 1 ;
break ;
+ // FederationTime yet put in header
+ // Body contains object,name
case GET_OBJECT_INSTANCE_HANDLE:
case GET_OBJECT_INSTANCE_NAME:
- header.VP.O_I.handle = object;
- header.VP.O_I.size = handleArraySize ;
- header.VP.O_I.date = getFederationTime() ;
header.bodySize = 1 ;
break ;
@@ -853,4 +858,4 @@
} // namespace certi
-// $Id: Message_W.cc,v 3.2 2007/10/26 14:36:29 rousse Exp $
+// $Id: Message_W.cc,v 3.3 2007/10/30 09:25:55 rousse Exp $
- certi/libCERTI Message_R.cc Message_W.cc,
certi-cvs <=