[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/NM_Classes.cc libCERTI/NM_Classe...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libCERTI/NM_Classes.cc libCERTI/NM_Classe... |
|
Date: |
Mon, 14 Sep 2009 17:54:09 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 09/09/14 17:54:09
Modified files:
libCERTI : NM_Classes.cc NM_Classes.hh NetworkMessage.hh
NetworkMessage.cc
RTIG : RTIG_processing.cc RTIG.hh RTIG.cc
RTIA : FederationManagement.cc
Log message:
A step further for a clean NetworkMessage class
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.47&r2=3.48
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.cc?cvsroot=certi&r1=3.38&r2=3.39
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.83&r2=3.84
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.hh?cvsroot=certi&r1=3.31&r2=3.32
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.55&r2=3.56
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&r1=3.69&r2=3.70
Patches:
Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- libCERTI/NM_Classes.cc 11 Sep 2009 18:45:34 -0000 3.17
+++ libCERTI/NM_Classes.cc 14 Sep 2009 17:54:08 -0000 3.18
@@ -469,6 +469,7 @@
NM_Join_Federation_Execution::NM_Join_Federation_Execution() {
this->name = "JOIN_FEDERATION_EXECUTION";
this->type = NetworkMessage::JOIN_FEDERATION_EXECUTION;
+ federateName = std::string("");
/* specific field init */
}
NM_Join_Federation_Execution::~NM_Join_Federation_Execution() {
@@ -1790,6 +1791,7 @@
/* call mother class */
Super::serialize(msgBuffer);
/* specific code (if any) goes here */
+ msgBuffer.write_string(federateName);
msgBuffer.write_string(FEDid);
msgBuffer.write_int16(number);
if (number) {
@@ -1800,6 +1802,7 @@
/* call mother class */
Super::deserialize(msgBuffer);
/* specific code (if any) goes here */
+ federateName = msgBuffer.read_string();
FEDid = msgBuffer.read_string();
number = msgBuffer.read_int16();
if (number) {
Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/NM_Classes.hh 11 Sep 2009 18:45:34 -0000 3.11
+++ libCERTI/NM_Classes.hh 14 Sep 2009 17:54:08 -0000 3.12
@@ -133,10 +133,14 @@
virtual void serialize(MessageBuffer& msgBuffer);
virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
+ std::string getFederationName() {return federationName;};
+ void setFederationName(std::string newFederationName)
{federationName=newFederationName;};
+ std::string getFEDid() {return FEDid;};
+ void setFEDid(std::string newFEDid) {FEDid=newFEDid;};
protected:
/* specific field */
- // std::string federationName ;
- // std::string FEDid ;
+ std::string federationName ;
+ std::string FEDid ;
private:
};
@@ -151,9 +155,11 @@
virtual void serialize(MessageBuffer& msgBuffer);
virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
+ std::string getFederationName() {return federationName;};
+ void setFederationName(std::string newFederationName)
{federationName=newFederationName;};
protected:
/* specific field */
- // std::string federationName;
+ std::string federationName;
private:
};
@@ -167,6 +173,10 @@
virtual ~NM_Join_Federation_Execution();
virtual void serialize(MessageBuffer& msgBuffer);
virtual void deserialize(MessageBuffer& msgBuffer);
+ std::string getFederateName() {return federateName;};
+ void setFederateName(std::string newFederateName)
{federateName=newFederateName;};
+ std::string getFederationName() {return federationName;};
+ void setFederationName(std::string newFederationName)
{federationName=newFederationName;};
/* specific Getter/Setter */
protected:
/* specific field */
@@ -174,8 +184,8 @@
// uint32_t multicastAddress;
// uint32_t bestEffortAddress;
// uint32_t bestEffortPeer;
- // std::string federationName;
- // std::string federateName;
+ std::string federationName;
+ std::string federateName;
private:
};
@@ -1519,6 +1529,8 @@
virtual void serialize(MessageBuffer& msgBuffer);
virtual void deserialize(MessageBuffer& msgBuffer);
/* specific Getter/Setter */
+ std::string getFederateName() {return federateName;};
+ void setFederateName(std::string newFederateName)
{federateName=newFederateName;};
void setFEDid(std::string newFEDid) {FEDid=newFEDid;};
const std::string getFEDid() const {return FEDid;};
// void setLineFollows() {lineFollows=true;};
@@ -1528,9 +1540,11 @@
std::string getFEDLine() {return line;};
protected:
/* specific field */
- // std::string FEDid;
+ std::string federateName;// the Federate name
+ std::string FEDid;
// bool lineFollows;
std::string line;
+
private:
};
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.47
retrieving revision 3.48
diff -u -b -r3.47 -r3.48
--- libCERTI/NetworkMessage.hh 11 Sep 2009 18:45:34 -0000 3.47
+++ libCERTI/NetworkMessage.hh 14 Sep 2009 17:54:08 -0000 3.48
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.47 2009/09/11 18:45:34 erk Exp $
+// $Id: NetworkMessage.hh,v 3.48 2009/09/14 17:54:08 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -196,10 +196,6 @@
UShort number ;
- std::string federationName ;
- std::string federateName;
- std::string FEDid ;
-
int bestEffortPeer ;
unsigned long bestEffortAddress ;
@@ -347,4 +343,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.47 2009/09/11 18:45:34 erk Exp $
+// $Id: NetworkMessage.hh,v 3.48 2009/09/14 17:54:08 erk Exp $
Index: libCERTI/NetworkMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.cc,v
retrieving revision 3.38
retrieving revision 3.39
diff -u -b -r3.38 -r3.39
--- libCERTI/NetworkMessage.cc 21 Sep 2008 16:46:25 -0000 3.38
+++ libCERTI/NetworkMessage.cc 14 Sep 2009 17:54:08 -0000 3.39
@@ -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: NetworkMessage.cc,v 3.38 2008/09/21 16:46:25 gotthardp Exp $
+// $Id: NetworkMessage.cc,v 3.39 2009/09/14 17:54:08 erk Exp $
// ----------------------------------------------------------------------------
@@ -49,11 +49,7 @@
federation = 0 ;
federate = 0 ;
- federationName = std::string("") ;
- federateName = std::string("") ;
-
label = std::string("") ;
- FEDid = std::string("") ;
bestEffortPeer = -1 ;
bestEffortAddress = 0 ;
@@ -166,4 +162,4 @@
} // namespace certi
-// $Id: NetworkMessage.cc,v 3.38 2008/09/21 16:46:25 gotthardp Exp $
+// $Id: NetworkMessage.cc,v 3.39 2009/09/14 17:54:08 erk Exp $
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.83
retrieving revision 3.84
diff -u -b -r3.83 -r3.84
--- RTIG/RTIG_processing.cc 7 Jun 2009 15:08:45 -0000 3.83
+++ RTIG/RTIG_processing.cc 14 Sep 2009 17:54:09 -0000 3.84
@@ -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.83 2009/06/07 15:08:45 gotthardp Exp $
+// $Id: RTIG_processing.cc,v 3.84 2009/09/14 17:54:09 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -41,10 +41,10 @@
// ----------------------------------------------------------------------------
//! Creates a new federation.
void
-RTIG::processCreateFederation(Socket *link, NetworkMessage *req)
+RTIG::processCreateFederation(Socket *link, NM_Create_Federation_Execution
*req)
{
- std::string federation = req->federationName;
- std::string FEDid = req->FEDid;
+ std::string federation = req->getFederationName();
+ std::string FEDid = req->getFEDid();
NM_Create_Federation_Execution rep; // rep for answer to RTIA
G.Out(pdGendoc,"enter RTIG::processCreateFederation");
@@ -106,8 +106,8 @@
if ( rep.exception == e_NO_EXCEPTION )
{
rep.federation = h ;
- rep.FEDid = FEDid;
- rep.federationName = federation;
+ rep.setFEDid(FEDid);
+ rep.setFederationName(federation);
auditServer <<" created.";
}
@@ -126,10 +126,10 @@
// ----------------------------------------------------------------------------
//! Add a new federate to federation.
void
-RTIG::processJoinFederation(Socket *link, NetworkMessage *req)
+RTIG::processJoinFederation(Socket *link, NM_Join_Federation_Execution *req)
{
- std::string federation = req->federationName ;
- std::string federate = req->federateName ;
+ std::string federation = req->getFederationName();
+ std::string federate = req->getFederateName();
std::string filename ;
unsigned int peer = req->bestEffortPeer ;
@@ -208,7 +208,7 @@
// Prepare answer about JoinFederationExecution
// This answer wille be made AFTER FED file processing
NM_Join_Federation_Execution rep ;
- rep.federationName = federation;
+ rep.setFederationName(federation);
rep.federate = num_federe ;
rep.federation = num_federation ;
rep.numberOfRegulators = nb_regulateurs ;
@@ -231,11 +231,11 @@
repFED.federate = num_federe ;
repFED.federation = num_federation ;
repFED.number = 0 ;
- repFED.FEDid = filename ;
+ repFED.setFEDid(filename);
repFED.exception = e ;
// Send answer
D.Out(pdTrace,"send NetworkMessage of Type %d after open \"%s\"",
- repFED.getType(),repFED.FEDid.c_str());
+ repFED.getType(),repFED.getFEDid().c_str());
G.Out(pdGendoc,"processJoinFederation====>Begin FED file transfer");
repFED.send(link,NM_msgBufSend);
@@ -262,7 +262,7 @@
repFED.federate = num_federe ;
repFED.federation = num_federation ;
repFED.number = num_line ;
- repFED.FEDid = filename;
+ repFED.setFEDid(filename);
// line transfered
repFED.setFEDLine(fileLine);
// Send answer
@@ -279,7 +279,7 @@
repFED.federate = num_federe ;
repFED.federation = num_federation ;
repFED.number = 0 ;
- repFED.FEDid = filename;
+ repFED.setFEDid(filename);
// Send answer
G.Out(pdGendoc,"processJoinFederation====>End FED file transfer");
@@ -336,12 +336,12 @@
// ----------------------------------------------------------------------------
//! Removes a federation.
void
-RTIG::processDestroyFederation(Socket *link, NetworkMessage *req)
+RTIG::processDestroyFederation(Socket *link, NM_Destroy_Federation_Execution
*req)
{
NM_Destroy_Federation_Execution rep ;
Handle num_federation ;
- std::string federation = req->federationName ;
+ std::string federation = req->getFederationName();
G.Out(pdGendoc,"enter RTIG::processDestroyFederation");
G.Out(pdGendoc,"BEGIN ** DESTROY FEDERATION SERVICE **");
@@ -378,7 +378,7 @@
}
rep.federate = req->federate ;
- rep.federationName = req->federationName;
+ rep.setFederationName(req->getFederationName());
if ( rep.exception == e_NO_EXCEPTION )
{
auditServer << "Federation Name \"" << federation.c_str() <<
"\"("<<num_federation<<") destroyed." ;
@@ -1552,4 +1552,4 @@
}} // namespace certi/rtig
-// $Id: RTIG_processing.cc,v 3.83 2009/06/07 15:08:45 gotthardp Exp $
+// $Id: RTIG_processing.cc,v 3.84 2009/09/14 17:54:09 erk Exp $
Index: RTIG/RTIG.hh
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.hh,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -b -r3.31 -r3.32
--- RTIG/RTIG.hh 20 Nov 2008 18:21:56 -0000 3.31
+++ RTIG/RTIG.hh 14 Sep 2009 17:54:09 -0000 3.32
@@ -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.hh,v 3.31 2008/11/20 18:21:56 approx Exp $
+// $Id: RTIG.hh,v 3.32 2009/09/14 17:54:09 erk Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_RTIG_HH
@@ -69,10 +69,10 @@
void closeConnection(Socket*, bool emergency);
// Event handlers
- void processCreateFederation(Socket*, NetworkMessage*);
- void processJoinFederation(Socket*, NetworkMessage*);
+ void processCreateFederation(Socket*, NM_Create_Federation_Execution*);
+ void processJoinFederation(Socket*, NM_Join_Federation_Execution*);
void processResignFederation(Socket*,Handle, FederateHandle);
- void processDestroyFederation(Socket*, NetworkMessage*);
+ void processDestroyFederation(Socket*, NM_Destroy_Federation_Execution*);
void processSetClassRelevanceAdvisorySwitch(Socket*,
NM_Set_Class_Relevance_Advisory_Switch*);
void processSetInteractionRelevanceAdvisorySwitch(Socket*,
@@ -144,4 +144,4 @@
#endif // CERTI_RTIG_HH
-// $Id: RTIG.hh,v 3.31 2008/11/20 18:21:56 approx Exp $
+// $Id: RTIG.hh,v 3.32 2009/09/14 17:54:09 erk Exp $
Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.55
retrieving revision 3.56
diff -u -b -r3.55 -r3.56
--- RTIG/RTIG.cc 2 Apr 2009 19:58:10 -0000 3.55
+++ RTIG/RTIG.cc 14 Sep 2009 17:54:09 -0000 3.56
@@ -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.55 2009/04/02 19:58:10 erk Exp $
+// $Id: RTIG.cc,v 3.56 2009/09/14 17:54:09 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -121,22 +121,18 @@
break ;
case NetworkMessage::CREATE_FEDERATION_EXECUTION:
- D.Out(pdTrace, "Create federation \"%s\".",
msg->federationName.c_str());
auditServer.setLevel(9);
- processCreateFederation(link, msg);
+ processCreateFederation(link,
static_cast<NM_Create_Federation_Execution*>(msg));
break ;
case NetworkMessage::DESTROY_FEDERATION_EXECUTION:
- D.Out(pdTrace, "Destroy federation \"%s\".",
msg->federationName.c_str());
auditServer.setLevel(9);
- processDestroyFederation(link, msg);
+ processDestroyFederation(link,
static_cast<NM_Destroy_Federation_Execution*>(msg));
break ;
case NetworkMessage::JOIN_FEDERATION_EXECUTION:
- D.Out(pdTrace, "federate \"%s\" joins federation \"%s\".",
- msg->federateName.c_str(), msg->federationName.c_str());
auditServer.setLevel(9);
- processJoinFederation(link, msg);
+ processJoinFederation(link,
static_cast<NM_Join_Federation_Execution*>(msg));
break ;
case NetworkMessage::RESIGN_FEDERATION_EXECUTION:
@@ -1039,4 +1035,4 @@
}} // namespace certi/rtig
-// $Id: RTIG.cc,v 3.55 2009/04/02 19:58:10 erk Exp $
+// $Id: RTIG.cc,v 3.56 2009/09/14 17:54:09 erk Exp $
Index: RTIA/FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.69
retrieving revision 3.70
diff -u -b -r3.69 -r3.70
--- RTIA/FederationManagement.cc 22 Oct 2008 14:24:34 -0000 3.69
+++ RTIA/FederationManagement.cc 14 Sep 2009 17:54:09 -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: FederationManagement.cc,v 3.69 2008/10/22 14:24:34 jmm Exp $
+// $Id: FederationManagement.cc,v 3.70 2009/09/14 17:54:09 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -130,8 +130,8 @@
if (e == e_NO_EXCEPTION)
{
- requete.federationName = theName;
- requete.FEDid = _FEDid;
+ requete.setFederationName(theName);
+ requete.setFEDid(_FEDid);
G.Out(pdGendoc,"createFederationExecution====> send Message to
RTIG");
@@ -209,7 +209,7 @@
{
requete.federation = _numero_federation ;
requete.federate = federate ;
- requete.federationName = theName;
+ requete.setFederationName(theName);
G.Out(pdGendoc,"destroyFederationExecution====>send Message to RTIG");
@@ -280,8 +280,8 @@
if (e == e_NO_EXCEPTION)
{
- requete.federationName = Federation;
- requete.federateName = Federate;
+ requete.setFederationName(Federation);
+ requete.setFederateName(Federate);
requete.bestEffortAddress = comm->getAddress();
requete.bestEffortPeer = comm->getPort();
@@ -322,7 +322,7 @@
filename+= Federation ;
// Last file type : fed or xml ?
- string filename_RTIG = reponse->FEDid ;
+ string filename_RTIG = getFedMsg->getFEDid();
int nbcar_filename_RTIG=filename_RTIG.length();
string extension = filename_RTIG.substr(nbcar_filename_RTIG-3,3) ;
if ( !strcasecmp(extension.c_str(),"fed") )
@@ -344,8 +344,8 @@
}
// RTIA says RTIG OK for file transfer
- requeteFED.federateName = Federate;
- requeteFED.FEDid = filename;
+ requeteFED.setFederateName(Federate);
+ requeteFED.setFEDid(filename);
if ( e == e_NO_EXCEPTION)
requeteFED.number = 0 ; // OK for open
else
@@ -377,9 +377,9 @@
reponse->handleArraySize = 1 ;
fedWorkFile << getFedMsg->getFEDLine();
// RTIA says OK to RTIG
- requeteFED.federateName =Federate;
+ requeteFED.setFederateName(Federate);
requeteFED.number = num_line ;
- requeteFED.FEDid = filename;
+ requeteFED.setFEDid(filename);
comm->sendMessage(&requeteFED);
}
// close working file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libCERTI/NM_Classes.cc libCERTI/NM_Classe...,
certi-cvs <=