[certi-cvs] certi RTIG/Federation.cc include/certi.hh libCE...

certi-cvs
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIG/Federation.cc include/certi.hh libCE...

From:	certi-cvs
Subject:	[certi-cvs] certi RTIG/Federation.cc include/certi.hh libCE...
Date:	Mon, 16 Jun 2008 09:03:25 +0000
CVSROOT:        /sources/certi
Module name:    certi
Changes by:     ROUSSELOT <rousse>      08/06/16 09:03:25

Modified files:
        RTIG           : Federation.cc 
        include        : certi.hh 
        libCERTI       : SecurityLevel.hh SecurityServer.cc 
        test/Billard   : Billard.cc 

Log message:
        #23329 BUG, dleteing others some constants. To be continued.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.91&r2=3.92
http://cvs.savannah.gnu.org/viewcvs/certi/include/certi.hh?cvsroot=certi&r1=3.29&r2=3.30
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SecurityLevel.hh?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SecurityServer.cc?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/Billard.cc?cvsroot=certi&r1=3.36&r2=3.37

Patches:
Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.91
retrieving revision 3.92
diff -u -b -r3.91 -r3.92
--- RTIG/Federation.cc  12 Jun 2008 07:39:51 -0000      3.91
+++ RTIG/Federation.cc  16 Jun 2008 09:03:24 -0000      3.92
@@ -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.91 2008/06/12 07:39:51 erk Exp $
+// $Id: Federation.cc,v 3.92 2008/06/16 09:03:24 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -786,8 +786,8 @@
 
     this->check(federate); // It may throw FederateNotExecutionMember.
 
-    if ((label == NULL) || (strlen(label) > MAX_USER_TAG_LENGTH))
-        throw RTIinternalError("Bad pause label(null or too long).");
+    if (label == NULL )
+        throw RTIinternalError("Bad pause label(null).");
 
     // Verify label does not already exists
     std::map<const char *, const char *>::const_iterator i ;
@@ -835,8 +835,8 @@
 
     this->check(federate); // It may throw FederateNotExecutionMember.
 
-    if ((label == NULL) || (strlen(label) > MAX_USER_TAG_LENGTH))
-        throw RTIinternalError("Bad pause label(null or too long).");
+    if (label == NULL)
+        throw RTIinternalError("Bad pause label(null).");
 
     // Verify label does not already exists
     std::map<const char *, const char *>::const_iterator i ;
@@ -885,8 +885,8 @@
 
     this->check(federate); // It may throw FederateNotExecutionMember.
 
-    if ((label == NULL) || (strlen(label) > MAX_USER_TAG_LENGTH))
-        throw RTIinternalError("Bad pause label(null or too long).");
+    if (label == NULL)
+        throw RTIinternalError("Bad pause label(null).");
 
     // broadcast announceSynchronizationPoint() to all federates in federation.
     NM_Announce_Synchronization_Point msg ;    
@@ -920,7 +920,7 @@
 
     this->check(federate); // It may throw FederateNotExecutionMember.
 
-    if ((label == NULL) || (strlen(label) > MAX_USER_TAG_LENGTH))
+    if (label == NULL)
         throw RTIinternalError("Bad pause label(null or too long).");
 
     // broadcast announceSynchronizationPoint() to all federates in federation.
@@ -1495,8 +1495,8 @@
 
     this->check(federate_handle); // It may throw FederateNotExecutionMember.
 
-    if ((label == NULL) || (strlen(label) > MAX_USER_TAG_LENGTH))
-        throw RTIinternalError("Bad pause label(null or too long).");
+    if (label == NULL)
+        throw RTIinternalError("Bad pause label(null).");
 
     // Set federate synchronized on this label.
     Federate &federate = getFederate(federate_handle);
@@ -2279,5 +2279,5 @@
 
 }} // namespace certi/rtig
 
-// $Id: Federation.cc,v 3.91 2008/06/12 07:39:51 erk Exp $
+// $Id: Federation.cc,v 3.92 2008/06/16 09:03:24 rousse Exp $
 

Index: include/certi.hh
===================================================================
RCS file: /sources/certi/certi/include/certi.hh,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -b -r3.29 -r3.30
--- include/certi.hh    11 Jun 2008 15:19:20 -0000      3.29
+++ include/certi.hh    16 Jun 2008 09:03:24 -0000      3.30
@@ -16,7 +16,7 @@
 // License along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: certi.hh,v 3.29 2008/06/11 15:19:20 rousse Exp $
+// $Id: certi.hh,v 3.30 2008/06/16 09:03:24 rousse Exp $
 // ----------------------------------------------------------------------------
 #include <vector>
 
@@ -95,11 +95,11 @@
 // Will be suppressed asap
 #define MAX_BYTES_PER_VALUE 500
 //#define MAX_FEDERATE_NAME_LENGTH 64
-#undef MAX_USER_TAG_LENGTH
-#define MAX_USER_TAG_LENGTH 64
+//#undef MAX_USER_TAG_LENGTH
+//#define MAX_USER_TAG_LENGTH 64
 //#undef MAX_ATTRIBUTES_PER_CLASS
 //#define MAX_ATTRIBUTES_PER_CLASS 50
-#define MAX_BYTES_PER_VALUETYPE 128
+//#define MAX_BYTES_PER_VALUETYPE 128
 //#undef MAX_PARAMETERS_PER_CLASS
 //#define MAX_PARAMETERS_PER_CLASS 50
 
@@ -247,8 +247,8 @@
 typedef AttributeValue ParameterValue ;
 typedef char *ParameterName ;
 typedef AttributeValue ValueName ;
-  typedef char ValueType[MAX_BYTES_PER_VALUETYPE + 1] ;
-  //  typedef std::vector<char>  ValueType;
+//typedef char ValueType[MAX_BYTES_PER_VALUETYPE + 1] ;
+//  typedef std::vector<char>  ValueType;
 struct Value {
     ValueName name ;
     ValueName value ;
@@ -384,4 +384,4 @@
        (uint64_t) CERTI_INT64_CONSTANT(0xff00000000000000U)) >> 56)))
 #endif // CERTI_HH_INCLUDED
 
-// $Id: certi.hh,v 3.29 2008/06/11 15:19:20 rousse Exp $
+// $Id: certi.hh,v 3.30 2008/06/16 09:03:24 rousse Exp $

Index: libCERTI/SecurityLevel.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SecurityLevel.hh,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- libCERTI/SecurityLevel.hh   6 Jul 2007 09:25:18 -0000       3.8
+++ libCERTI/SecurityLevel.hh   16 Jun 2008 09:03:24 -0000      3.9
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: SecurityLevel.hh,v 3.8 2007/07/06 09:25:18 erk Exp $
+// $Id: SecurityLevel.hh,v 3.9 2008/06/16 09:03:24 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef _CERTI_SECURITY_LEVEL_HH
@@ -30,6 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define MAX_SECURITYLEVELNAME 500
+
 typedef char *SecurityLevelName ; // Max length MAX_USER_TAG_LENGTH
 typedef unsigned short SecurityLevelID ;
 
@@ -48,12 +50,12 @@
                   SecurityLevelID InitLevelID)
     {
 /*#ifdef _WIN32
-    if((InitName == NULL) ||(strlen(InitName) > MAX_USER_TAG_LENGTH))
+    if((InitName == NULL) ||(strlen(InitName) > MAX_SECURITYLEVELNAME))
 #else
-    if((InitName == NULL) ||(std::strlen(InitName) > MAX_USER_TAG_LENGTH))
+    if((InitName == NULL) ||(std::strlen(InitName) > MAX_SECURITYLEVELNAME))
 #endif*/
 
-       if ((InitName == NULL) || (strlen(InitName) > MAX_USER_TAG_LENGTH))
+       if ((InitName == NULL) || (strlen(InitName) > MAX_SECURITYLEVELNAME))
             throw RTIinternalError("Bad Security Level Name.");
         Name = strdup(InitName);
         LevelID = InitLevelID ;
@@ -66,4 +68,4 @@
 
 #endif // _CERTI_SECURITY_LEVEL_HH
 
-// $Id: SecurityLevel.hh,v 3.8 2007/07/06 09:25:18 erk Exp $
+// $Id: SecurityLevel.hh,v 3.9 2008/06/16 09:03:24 rousse Exp $

Index: libCERTI/SecurityServer.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SecurityServer.cc,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/SecurityServer.cc  6 Jul 2007 09:25:18 -0000       3.11
+++ libCERTI/SecurityServer.cc  16 Jun 2008 09:03:24 -0000      3.12
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: SecurityServer.cc,v 3.11 2007/07/06 09:25:18 erk Exp $
+// $Id: SecurityServer.cc,v 3.12 2008/06/16 09:03:24 rousse Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -143,7 +143,7 @@
         insertPublicLevel();
     }
 
-    if ((theName == NULL) || (strlen(theName) > MAX_USER_TAG_LENGTH)) {
+    if ((theName == NULL) || (strlen(theName) > MAX_SECURITYLEVELNAME)) {
        D[pdDebug] << "Security Level Name null or too long." << endl ;
         throw RTIinternalError("Security Level Name null or too long.");
     }
@@ -190,4 +190,4 @@
 
 }
 
-// $Id: SecurityServer.cc,v 3.11 2007/07/06 09:25:18 erk Exp $
+// $Id: SecurityServer.cc,v 3.12 2008/06/16 09:03:24 rousse Exp $

Index: test/Billard/Billard.cc
===================================================================
RCS file: /sources/certi/certi/test/Billard/Billard.cc,v
retrieving revision 3.36
retrieving revision 3.37
diff -u -b -r3.36 -r3.37
--- test/Billard/Billard.cc     12 Jun 2008 07:39:50 -0000      3.36
+++ test/Billard/Billard.cc     16 Jun 2008 09:03:25 -0000      3.37
@@ -735,6 +735,7 @@
             }
     }
     catch (RTI::Exception& e) {
+        std::cout<<"Exception "<<e._name<<" ("<<e._reason<<")"<<std::endl;
         D.Out(pdExcept, "**** Exception updating attribute values: %d", &e);
     }
[Prev in Thread]
Current Thread
[Next in Thread]
[certi-cvs] certi RTIG/Federation.cc include/certi.hh libCE..., certi-cvs <=
- [certi-cvs] certi RTIG/Federation.cc include/certi.hh libCE..., certi-cvs, 2008/06/24
Prev by Date: [certi-cvs] applications/HLA_TestsSuite CMakeLists.txt dtes...
Next by Date: [certi-cvs] applications/HLA_TestsSuite dtest_test_Sync.py
Previous by thread: [certi-cvs] applications/HLA_TestsSuite CMakeLists.txt dtes...
Next by thread: [certi-cvs] certi RTIG/Federation.cc include/certi.hh libCE...
Index(es):
- Date
- Thread