[certi-cvs] certi RTIA/Communications.cc RTIG/RTIG.cc RTIG/...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     ROUSSELOT <rousse>      08/04/08 08:50:23

Modified files:
        RTIA           : Communications.cc 
        RTIG           : RTIG.cc RTIG_processing.cc 

Log message:
        Some improvment in auditServer

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Communications.cc?cvsroot=certi&r1=3.22&r2=3.23
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.37&r2=3.38
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.59&r2=3.60

Patches:
Index: RTIA/Communications.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/Communications.cc,v
retrieving revision 3.22
retrieving revision 3.23
diff -u -b -r3.22 -r3.23
--- RTIA/Communications.cc      22 Feb 2008 11:34:30 -0000      3.22
+++ RTIA/Communications.cc      8 Apr 2008 08:50:22 -0000       3.23
@@ -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: Communications.cc,v 3.22 2008/02/22 11:34:30 siron Exp $
+// $Id: Communications.cc,v 3.23 2008/04/08 08:50:22 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -139,12 +139,15 @@
 Communications::~Communications()
 {
     // Advertise RTIG that TCP link is being closed.
+    G.Out(pdGendoc,"enter Communications::~Communications");
 
     NetworkMessage msg ;
     msg.type = NetworkMessage::CLOSE_CONNEXION ;
     msg.write((SecureTCPSocket *) this);
 
     SecureTCPSocket::close();
+
+    G.Out(pdGendoc,"exit  Communications::~Communications");
 }
 
 // ----------------------------------------------------------------------------
@@ -339,4 +342,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: Communications.cc,v 3.22 2008/02/22 11:34:30 siron Exp $
+// $Id: Communications.cc,v 3.23 2008/04/08 08:50:22 rousse Exp $

Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.37
retrieving revision 3.38
diff -u -b -r3.37 -r3.38
--- RTIG/RTIG.cc        1 Apr 2008 13:00:47 -0000       3.37
+++ RTIG/RTIG.cc        8 Apr 2008 08:50:23 -0000       3.38
@@ -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.cc,v 3.37 2008/04/01 13:00:47 rousse Exp $
+// $Id: RTIG.cc,v 3.38 2008/04/08 08:50:23 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -389,6 +389,7 @@
     Handle federation ;
     FederateHandle federate ;
 
+    G.Out(pdGendoc,"enter RTIG::closeConnection");
     try {
         socketServer.close(link->returnSocket(), federation, federate);
     }
@@ -401,6 +402,8 @@
         federations.killFederate(federation, federate);
         D.Out(pdExcept, "Federate(%u, %u)Killed... ", federation, federate);
     }
+
+    G.Out(pdGendoc,"exit  RTIG::closeConnection");
 }
 
 // ----------------------------------------------------------------------------
@@ -988,4 +991,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG.cc,v 3.37 2008/04/01 13:00:47 rousse Exp $
+// $Id: RTIG.cc,v 3.38 2008/04/08 08:50:23 rousse Exp $

Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.59
retrieving revision 3.60
diff -u -b -r3.59 -r3.60
--- RTIG/RTIG_processing.cc     3 Apr 2008 15:21:51 -0000       3.59
+++ RTIG/RTIG_processing.cc     8 Apr 2008 08:50:23 -0000       3.60
@@ -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.59 2008/04/03 15:21:51 rousse Exp $
+// $Id: RTIG_processing.cc,v 3.60 2008/04/08 08:50:23 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -109,6 +109,7 @@
         strcpy(rep.FEDid,FEDid) ;
         rep.federationName = new char [strlen(federation)+1] ;
         strcpy(rep.federationName,federation);
+        auditServer <<" created." ;
         }
 
     G.Out(pdGendoc,"processCreateFederation===>write answer to RTIA");
@@ -334,6 +335,7 @@
     D.Out(pdInit, "Federate %u is resigning from federation %u.",
           federe, federation);
 
+    auditServer << "Federate " << federe << " resign 
federation("<<federation<<")" ;
     G.Out(pdGendoc,"exit RTIG::processResignFederation");
     G.Out(pdGendoc,"END ** RESIGN FEDERATION SERVICE **");
 
@@ -356,7 +358,6 @@
 
     if (federation == NULL) throw RTIinternalError("Invalid Federation Name.");
 
-    auditServer << "Name \"" << federation << "\"" ;
     federations.exists(federation, num_federation);
     // May throw RTIinternalError
     //           FederatesCurrentlyJoined
@@ -383,7 +384,7 @@
         else if (strcmp(e._name,"FederatesCurrentlyJoined")==0 )
           {
           rep.exception = e_FederatesCurrentlyJoined;
-          strcpy(rep.exceptionReason,e._reason);
+          strcpy(rep.exceptionReason,"at least one federate joined");
           }       
       }
 
@@ -391,11 +392,16 @@
     rep.federate = req->federate ;
     rep.federationName = new char[strlen(req->federationName)+1];
     strcpy(rep.federationName,req->federationName);
-
+    if ( rep.exception == e_NO_EXCEPTION )
+       {
+       auditServer << "Federation Name \"" << federation << 
"\"("<<num_federation<<") destroyed." ;
+       }
     G.Out(pdGendoc,"processDestroyFederation===>write DFE to RTIA");
 
     rep.write(link);
 
+
+
     G.Out(pdGendoc,"END ** DESTROY FEDERATION SERVICE **");
     G.Out(pdGendoc,"exit RTIG::processDestroyFederation");
 }
@@ -1462,4 +1468,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.59 2008/04/03 15:21:51 rousse Exp $
+// $Id: RTIG_processing.cc,v 3.60 2008/04/08 08:50:23 rousse Exp $