[certi-cvs] certi libCERTI/ObjectClassBroadcastList.cc libC...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      08/05/23 12:37:22

Modified files:
        libCERTI       : ObjectClassBroadcastList.cc NetworkMessage.hh 
                         NM_Classes.hh NM_Classes.cc 
        RTIG           : RTIG_processing.cc 

Log message:
        get rid of "NetworkMessage::boolean" multi-usage field.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.cc?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.34&r2=3.35
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&r1=3.3&r2=3.4
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&r1=3.6&r2=3.7
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.69&r2=3.70

Patches:
Index: libCERTI/ObjectClassBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.cc,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- libCERTI/ObjectClassBroadcastList.cc        26 Apr 2008 14:59:41 -0000      
3.19
+++ libCERTI/ObjectClassBroadcastList.cc        23 May 2008 12:37:21 -0000      
3.20
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: ObjectClassBroadcastList.cc,v 3.19 2008/04/26 14:59:41 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.20 2008/05/23 12:37:21 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -69,12 +69,17 @@
     reducedMessage->federation = message->federation ;
     reducedMessage->federate = message->federate ;
     reducedMessage->object = message->object ;
+    if (message->isDated()) {
     reducedMessage->setDate(message->getDate());
-    reducedMessage->boolean = message->boolean ; // FIXME Useful ?
+    }
+    if (message->isTagged()) {
+       reducedMessage->setTag(message->getTag());
+    }
     reducedMessage->objectClass = message->objectClass ;
 
+    if (message->isLabelled()) {
     reducedMessage->setLabel(message->getLabel());
-
+    }
     // Copy attributes that are in the bsWaiting state in Line.
     UShort currentSize ;
     AttributeHandle currentAttrib ;
@@ -391,4 +396,4 @@
 
 } // namespace certi
 
-// $Id: ObjectClassBroadcastList.cc,v 3.19 2008/04/26 14:59:41 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.20 2008/05/23 12:37:21 erk Exp $

Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.34
retrieving revision 3.35
diff -u -b -r3.34 -r3.35
--- libCERTI/NetworkMessage.hh  12 May 2008 12:16:59 -0000      3.34
+++ libCERTI/NetworkMessage.hh  23 May 2008 12:37:21 -0000      3.35
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: NetworkMessage.hh,v 3.34 2008/05/12 12:16:59 erk Exp $
+// $Id: NetworkMessage.hh,v 3.35 2008/05/23 12:37:21 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_NETWORK_MESSAGE_HH
@@ -224,7 +224,6 @@
        ObjectHandle           object;
        ObjectClassHandle      objectClass;
        InteractionClassHandle interactionClass;
-       bool boolean ;
 
        /**
         * Indicate if the message is dated/timestamped or not
@@ -364,4 +363,4 @@
 
 #endif // CERTI_NETWORK_MESSAGE_HH
 
-// $Id: NetworkMessage.hh,v 3.34 2008/05/12 12:16:59 erk Exp $
+// $Id: NetworkMessage.hh,v 3.35 2008/05/23 12:37:21 erk Exp $

Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.hh,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -b -r3.3 -r3.4
--- libCERTI/NM_Classes.hh      22 May 2008 12:20:19 -0000      3.3
+++ libCERTI/NM_Classes.hh      23 May 2008 12:37:22 -0000      3.4
@@ -76,6 +76,7 @@
        void setInteractionClass(InteractionClassHandle interactionClass) 
{this->interactionClass=interactionClass;};
 protected:
        /* specific field */
+       bool DDM_bool;
 private:
 };
 
@@ -280,6 +281,8 @@
        typedef NM_WithHandleArray Super;
        NM_Register_Federation_Synchronization_Point();
        virtual ~NM_Register_Federation_Synchronization_Point();        
+       virtual void serialize(MessageBuffer& msgBuffer);
+       virtual void deserialize(MessageBuffer& msgBuffer);     
        /* specific Getter/Setter */
        void setExist() {_setExist=true;};
        void setDoesNotExist() {_setExist=false;};              

Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.cc,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -b -r3.6 -r3.7
--- libCERTI/NM_Classes.cc      22 May 2008 12:20:20 -0000      3.6
+++ libCERTI/NM_Classes.cc      23 May 2008 12:37:22 -0000      3.7
@@ -362,7 +362,7 @@
        this->region      = 0;
        this->object      = 0;
        this->objectClass = 0;
-       this->boolean     = false;
+       this->DDM_bool    = false; /* FIXME don't know the purpose of this */
 }
 
 NM_DDM_Base::~NM_DDM_Base() {
@@ -560,6 +560,20 @@
 }
 
NM_Register_Federation_Synchronization_Point::~NM_Register_Federation_Synchronization_Point()
 {
 }
+void 
+NM_Register_Federation_Synchronization_Point::serialize(MessageBuffer& 
msgBuffer) {
+       /* call mother class */      
+       Super::serialize(msgBuffer); 
+       /* specific code (if any) goes here */
+       msgBuffer.write_bool(_setExist);  
+} /* end of serialize */ 
+void 
+NM_Register_Federation_Synchronization_Point::deserialize(MessageBuffer& 
msgBuffer) {
+       /* call mother class */      
+       Super::deserialize(msgBuffer); 
+       /* specific code (if any) goes here */
+       _setExist = msgBuffer.read_bool();
+} /* end of deserialize */
 /*<END>---------- Register_Federation_Synchronization_Point ------------<END>*/
 
 /*<BEGIN>---------- Synchronization_Point_Registration_Succeeded 
------------<BEGIN>*/
@@ -1441,7 +1455,7 @@
        /* specific code (if any) goes here */
        msgBuffer.write_int32(object);
        msgBuffer.write_int32(region);
-       msgBuffer.write_bool(boolean);
+       msgBuffer.write_bool(DDM_bool);
 } /* end of serialize */ 
 void NM_DDM_Associate_Region::deserialize(MessageBuffer& msgBuffer) {
        /* call mother class */      
@@ -1449,7 +1463,7 @@
        /* specific code (if any) goes here */
        object  = msgBuffer.read_int32();
        region  = msgBuffer.read_int32();
-       boolean = msgBuffer.read_bool();
+       DDM_bool = msgBuffer.read_bool();
 } /* end of deserialize */
 /*<END>---------- DDM_Associate_Region ------------<END>*/
 
@@ -1468,7 +1482,7 @@
        msgBuffer.write_int32(object);
        msgBuffer.write_int32(objectClass);
        msgBuffer.write_int32(region);
-       msgBuffer.write_bool(boolean);
+       msgBuffer.write_bool(DDM_bool);
 } /* end of serialize */ 
 void NM_DDM_Register_Object::deserialize(MessageBuffer& msgBuffer) {
        /* call mother class */      
@@ -1477,7 +1491,7 @@
        object      = msgBuffer.read_int32();
        objectClass = msgBuffer.read_int32();
        region      = msgBuffer.read_int32();
-       boolean     = msgBuffer.read_bool();
+       DDM_bool     = msgBuffer.read_bool();
 } /* end of deserialize */
 /*<END>---------- DDM_Register_Object ------------<END>*/
 
@@ -1519,7 +1533,7 @@
        /* specific code (if any) goes here */
        msgBuffer.write_int32(objectClass);
        msgBuffer.write_int32(region);
-       msgBuffer.write_bool(boolean);
+       msgBuffer.write_bool(DDM_bool);
 } /* end of serialize */ 
 void NM_DDM_Subscribe_Attributes::deserialize(MessageBuffer& msgBuffer) {
        /* call mother class */      
@@ -1527,7 +1541,7 @@
        /* specific code (if any) goes here */
        objectClass = msgBuffer.read_int32();
        region      = msgBuffer.read_int32();
-       boolean     = msgBuffer.read_bool();
+       DDM_bool     = msgBuffer.read_bool();
 } /* end of deserialize */
 /*<END>---------- DDM_Subscribe_Attributes ------------<END>*/
 
@@ -1569,7 +1583,7 @@
        /* specific code (if any) goes here */
        msgBuffer.write_int32(interactionClass);
        msgBuffer.write_int32(region);
-       msgBuffer.write_bool(boolean);
+       msgBuffer.write_bool(DDM_bool);
 } /* end of serialize */ 
 void NM_DDM_Subscribe_Interaction::deserialize(MessageBuffer& msgBuffer) {
        /* call mother class */      
@@ -1577,7 +1591,7 @@
        /* specific code (if any) goes here */
        interactionClass = msgBuffer.read_int32();
        region           = msgBuffer.read_int32();
-       boolean           = msgBuffer.read_bool();
+       DDM_bool           = msgBuffer.read_bool();
 } /* end of deserialize */
 /*<END>---------- DDM_Subscribe_Interaction ------------<END>*/
 

Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.69
retrieving revision 3.70
diff -u -b -r3.69 -r3.70
--- RTIG/RTIG_processing.cc     22 May 2008 12:20:21 -0000      3.69
+++ RTIG/RTIG_processing.cc     23 May 2008 12:37:22 -0000      3.70
@@ -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: RTIG_processing.cc,v 3.69 2008/05/22 12:20:21 erk Exp $
+// $Id: RTIG_processing.cc,v 3.70 2008/05/23 12:37:22 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -568,7 +568,7 @@
 
     auditServer << "Federation save request." ;
 
-    if ( req->boolean )
+    if ( req->isDated() )
         // With time
         federations.requestFederationSave(req->federation, req->federate,
                                           req->getLabel().c_str(), 
req->getDate());
@@ -1427,4 +1427,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.69 2008/05/22 12:20:21 erk Exp $
+// $Id: RTIG_processing.cc,v 3.70 2008/05/23 12:37:22 erk Exp $