[certi-cvs] certi RTIA/FederationManagement.cc RTIG/Federat...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      09/11/25 22:05:19

Modified files:
        RTIA           : FederationManagement.cc 
        RTIG           : Federation.cc 
        libCERTI       : NetworkMessage.hh RootObject.hh RootObject.cc 

Log message:
        Cosmetic changes after
        patch #6939: Send object model information as binary encoding
        rename getFOM/setFOM methods.
        re-add GET_FED_FILE_SUPPRESSED enum value
        where GET_FED_FILE was for compatibility purpose.
        We should suppress that later or keep it in order to be able
        to reject the oldish message type.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&r1=3.78&r2=3.79
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.120&r2=3.121
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.53&r2=3.54
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/RootObject.hh?cvsroot=certi&r1=3.34&r2=3.35
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/RootObject.cc?cvsroot=certi&r1=3.48&r2=3.49

Patches:
Index: RTIA/FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.78
retrieving revision 3.79
diff -u -b -r3.78 -r3.79
--- RTIA/FederationManagement.cc        20 Nov 2009 16:31:31 -0000      3.78
+++ RTIA/FederationManagement.cc        25 Nov 2009 22:05:19 -0000      3.79
@@ -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: FederationManagement.cc,v 3.78 2009/11/20 16:31:31 erk Exp $
+// $Id: FederationManagement.cc,v 3.79 2009/11/25 22:05:19 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -255,7 +255,7 @@
         // Then we except a NULL message from each.
         if (reponse->getException() == e_NO_EXCEPTION) {
             NM_Join_Federation_Execution* joinResponse = 
static_cast<NM_Join_Federation_Execution*>(reponse.get());
-            rootObject->setFOM(*joinResponse);
+            rootObject->rebuildFromSerializedFOM(*joinResponse);
 
             _nom_federation = Federation;
             _nom_federe = Federate;

Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.120
retrieving revision 3.121
diff -u -b -r3.120 -r3.121
--- RTIG/Federation.cc  24 Nov 2009 21:44:47 -0000      3.120
+++ RTIG/Federation.cc  25 Nov 2009 22:05:19 -0000      3.121
@@ -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.cc,v 3.120 2009/11/24 21:44:47 erk Exp $
+// $Id: Federation.cc,v 3.121 2009/11/25 22:05:19 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -740,7 +740,7 @@
 void
 Federation::getFOM(NM_Join_Federation_Execution& objectModelData)
 {
-    root->getFOM(objectModelData);
+    root->convertToSerializedFOM(objectModelData);
 }
 
 // ----------------------------------------------------------------------------
@@ -2585,5 +2585,5 @@
 
 }} // namespace certi/rtig
 
-// $Id: Federation.cc,v 3.120 2009/11/24 21:44:47 erk Exp $
+// $Id: Federation.cc,v 3.121 2009/11/25 22:05:19 erk Exp $
 

Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.53
retrieving revision 3.54
diff -u -b -r3.53 -r3.54
--- libCERTI/NetworkMessage.hh  24 Nov 2009 19:11:37 -0000      3.53
+++ libCERTI/NetworkMessage.hh  25 Nov 2009 22:05:19 -0000      3.54
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: NetworkMessage.hh,v 3.53 2009/11/24 19:11:37 erk Exp $
+// $Id: NetworkMessage.hh,v 3.54 2009/11/25 22:05:19 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_NETWORK_MESSAGE_HH
@@ -138,6 +138,7 @@
                DDM_SUBSCRIBE_INTERACTION,
                DDM_UNSUBSCRIBE_INTERACTION,
                PROVIDE_ATTRIBUTE_VALUE_UPDATE,
+               GET_FED_FILE_SUPPRESSED,
                SET_CLASS_RELEVANCE_ADVISORY_SWITCH,
                SET_INTERACTION_RELEVANCE_ADVISORY_SWITCH,
                SET_ATTRIBUTE_RELEVANCE_ADVISORY_SWITCH,
@@ -335,4 +336,4 @@
 
 #endif // CERTI_NETWORK_MESSAGE_HH
 
-// $Id: NetworkMessage.hh,v 3.53 2009/11/24 19:11:37 erk Exp $
+// $Id: NetworkMessage.hh,v 3.54 2009/11/25 22:05:19 erk Exp $

Index: libCERTI/RootObject.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/RootObject.hh,v
retrieving revision 3.34
retrieving revision 3.35
diff -u -b -r3.34 -r3.35
--- libCERTI/RootObject.hh      19 Nov 2009 18:15:32 -0000      3.34
+++ libCERTI/RootObject.hh      25 Nov 2009 22:05:19 -0000      3.35
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RootObject.hh,v 3.34 2009/11/19 18:15:32 erk Exp $
+// $Id: RootObject.hh,v 3.35 2009/11/25 22:05:19 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef LIBCERTI_ROOT_OBJECT
@@ -170,12 +170,12 @@
     /**
      * Serialize the federate object model into a message buffer.
      */
-    void getFOM(NM_Join_Federation_Execution& message);
+    void convertToSerializedFOM(NM_Join_Federation_Execution& message);
 
     /**
      * Deserialize the federate object model from a message buffer.
      */
-    void setFOM(const NM_Join_Federation_Execution& message);
+    void rebuildFromSerializedFOM(const NM_Join_Federation_Execution& message);
 
 private:
 
@@ -194,4 +194,4 @@
 
 #endif // LIBCERTI_ROOT_OBJECT
 
-// $Id: RootObject.hh,v 3.34 2009/11/19 18:15:32 erk Exp $
+// $Id: RootObject.hh,v 3.35 2009/11/25 22:05:19 erk Exp $

Index: libCERTI/RootObject.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/RootObject.cc,v
retrieving revision 3.48
retrieving revision 3.49
diff -u -b -r3.48 -r3.49
--- libCERTI/RootObject.cc      24 Nov 2009 16:39:20 -0000      3.48
+++ libCERTI/RootObject.cc      25 Nov 2009 22:05:19 -0000      3.49
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RootObject.cc,v 3.48 2009/11/24 16:39:20 erk Exp $
+// $Id: RootObject.cc,v 3.49 2009/11/25 22:05:19 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include "Object.hh"
@@ -360,7 +360,7 @@
 } /* end of addInteractionClass */
 
 void
-RootObject::getFOM(NM_Join_Federation_Execution& message)
+RootObject::convertToSerializedFOM(NM_Join_Federation_Execution& message)
 {
         // The rounting spaces
         uint32_t routingSpaceCount = spaces.size();
@@ -480,7 +480,7 @@
 }
 
 void
-RootObject::setFOM(const NM_Join_Federation_Execution& message)
+RootObject::rebuildFromSerializedFOM(const NM_Join_Federation_Execution& 
message)
 {
         // The number of routing space records to read
         uint32_t routingSpaceCount = message.getNumRoutingSpaces();
@@ -556,8 +556,8 @@
                         current->addParameter(parameter);
                 }
         }
-} /* end of setFOM */
+} /* end of rebuildFromSerializedFOM */
 
 } // namespace certi
 
-// $Id: RootObject.cc,v 3.48 2009/11/24 16:39:20 erk Exp $
+// $Id: RootObject.cc,v 3.49 2009/11/25 22:05:19 erk Exp $