[certi-cvs] certi RTIA/TimeManagement.cc CMakeLists.txt

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/08/17 06:47:38

Modified files:
        RTIA           : TimeManagement.cc 
        .              : CMakeLists.txt 

Log message:
        Make the NULL PRIME message use optionnal (need formal validation)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.64&r2=3.65
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.84&r2=1.85

Patches:
Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.64
retrieving revision 3.65
diff -u -b -r3.64 -r3.65
--- RTIA/TimeManagement.cc      16 Aug 2010 15:26:02 -0000      3.64
+++ RTIA/TimeManagement.cc      17 Aug 2010 06:47:38 -0000      3.65
@@ -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: TimeManagement.cc,v 3.64 2010/08/16 15:26:02 erk Exp $
+// $Id: TimeManagement.cc,v 3.65 2010/08/17 06:47:38 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -121,7 +121,7 @@
 void TimeManagement::sendNullPrimeMessage(FederationTime logicalTime)
 {
     NM_Message_Null_Prime msg ;
-
+#ifdef CERTI_USE_NULL_PRIME_MESSAGE_PROTOCOL
     /*
      * We cannot send null prime in the past of
      *  - the last NULL message
@@ -139,6 +139,7 @@
         D.Out(pdExcept, "NULL PRIME message not sent (Time = %f, Last NULL= 
%f, Last NULL PRIME = %f).",
               logicalTime.getTime(), lastNullMessageDate.getTime(), 
lastNullPrimeMessageDate.getTime());
     }
+#endif
 } /* end of sendNullPrimeMessage */
 
 // ----------------------------------------------------------------------------
@@ -1048,4 +1049,4 @@
 
 }} // namespaces
 
-// $Id: TimeManagement.cc,v 3.64 2010/08/16 15:26:02 erk Exp $
+// $Id: TimeManagement.cc,v 3.65 2010/08/17 06:47:38 erk Exp $

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- CMakeLists.txt      9 Aug 2010 18:24:07 -0000       1.84
+++ CMakeLists.txt      17 Aug 2010 06:47:38 -0000      1.85
@@ -69,6 +69,13 @@
     ADD_DEFINITIONS(-DRTIA_USE_TCP)
 ENDIF(RTIA_USE_TCP)
 
+# The new NULL Prime message protocol
+OPTION(CERTI_USE_NULL_PRIME_MESSAGE_PROTOCOL 
+         "NULL PRIME MESSAGE protocol is an enhanced version of the CMB NULL 
MESSAGE protocol (experimental)" OFF)
+IF(CERTI_USE_NULL_PRIME_MESSAGE_PROTOCOL)
+    ADD_DEFINITIONS(-DCERTI_USE_NULL_PRIME_MESSAGE_PROTOCOL)
+ENDIF(CERTI_USE_NULL_PRIME_MESSAGE_PROTOCOL)         
+
 IF (NOT CMAKE_BUILD_TYPE)
    MESSAGE(STATUS "No build type selected, default to Debug")
    SET(CMAKE_BUILD_TYPE "Debug")