[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
certi/libCERTI Message.hh Message_W.cc NetworkM...
|
From: |
certi-cvs |
|
Subject: |
certi/libCERTI Message.hh Message_W.cc NetworkM... |
|
Date: |
Thu, 13 Dec 2007 14:43:05 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: ROUSSELOT <rousse> 07/12/13 14:43:05
Modified files:
libCERTI : Message.hh Message_W.cc NetworkMessage.cc
NetworkMessage.hh NetworkMessage_RW.cc
Log message:
Little things after suppress of MAX_FED_FILENAME
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.hh?cvsroot=certi&r1=3.39&r2=3.40
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.cc?cvsroot=certi&r1=3.23&r2=3.24
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.27&r2=3.28
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&r1=3.35&r2=3.36
Patches:
Index: Message.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.hh,v
retrieving revision 3.39
retrieving revision 3.40
diff -u -b -r3.39 -r3.40
--- Message.hh 11 Dec 2007 16:44:20 -0000 3.39
+++ Message.hh 13 Dec 2007 14:43:04 -0000 3.40
@@ -462,6 +462,7 @@
void writeHandleArray(MessageBody &);
void writeResignAction(MessageBody &);
void writeValueArray(MessageBody &);
+ void writeFEDid(MessageBody &);
MessageHeader header ;
char label[MAX_USER_TAG_LENGTH + 1] ;
@@ -469,9 +470,7 @@
char federateName[MAX_FEDERATE_NAME_LENGTH + 1] ;
char federationName[MAX_FEDERATION_NAME_LENGTH + 1] ;
char tag[MAX_USER_TAG_LENGTH + 1] ;
- // char FEDid[MAX_FEDFILE_NAME_LENGTH + 1] ;
char *FEDid ;
- // valueArray is now a ValueLengthPair
ValueLengthPair valueArray[MAX_ATTRIBUTES_PER_CLASS] ;
};
Index: Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- Message_W.cc 11 Dec 2007 16:44:20 -0000 3.11
+++ Message_W.cc 13 Dec 2007 14:43:04 -0000 3.12
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_W.cc,v 3.11 2007/12/11 16:44:20 rousse Exp $
+// $Id: Message_W.cc,v 3.12 2007/12/13 14:43:04 rousse Exp $
// ----------------------------------------------------------------------------
@@ -75,11 +75,9 @@
switch(header.type) {
// Body contains federationName,FEDid
- // Note : relevant only on federate request
case CREATE_FEDERATION_EXECUTION:
body.writeString(federationName);
- body.writeShortInt(strlen(FEDid));
- body.writeString(FEDid);
+ writeFEDid(body);
break ;
// Body contains federationName
@@ -680,6 +678,14 @@
//assert(false);
}
+// ---------------------------------------------------------------
+void
+Message::writeFEDid(MessageBody &body)
+{
+ body.writeShortInt(strlen(FEDid));
+ body.writeString(FEDid);
+}
+
// ---------------------------------------------------------------------------
void
Message::writeValueArray(MessageBody &body)
@@ -695,4 +701,4 @@
} // namespace certi
-// $Id: Message_W.cc,v 3.11 2007/12/11 16:44:20 rousse Exp $
+// $Id: Message_W.cc,v 3.12 2007/12/13 14:43:04 rousse Exp $
Index: NetworkMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.cc,v
retrieving revision 3.23
retrieving revision 3.24
diff -u -b -r3.23 -r3.24
--- NetworkMessage.cc 11 Dec 2007 17:27:42 -0000 3.23
+++ NetworkMessage.cc 13 Dec 2007 14:43:04 -0000 3.24
@@ -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.23 2007/12/11 17:27:42 rousse Exp $
+// $Id: NetworkMessage.cc,v 3.24 2007/12/13 14:43:04 rousse Exp $
// ----------------------------------------------------------------------------
@@ -329,6 +329,14 @@
G.Out(pdGendoc,"exit NetworkMessage::readFEDid");
}
+// ---------------------------------------------------------------
+void
+NetworkMessage::writeFEDid(MessageBody &body)
+{
+ body.writeShortInt(strlen(FEDid));
+ body.writeString(FEDid);
+}
+
} // namespace certi
-// $Id: NetworkMessage.cc,v 3.23 2007/12/11 17:27:42 rousse Exp $
+// $Id: NetworkMessage.cc,v 3.24 2007/12/13 14:43:04 rousse Exp $
Index: NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -b -r3.27 -r3.28
--- NetworkMessage.hh 11 Dec 2007 16:44:20 -0000 3.27
+++ NetworkMessage.hh 13 Dec 2007 14:43:04 -0000 3.28
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: NetworkMessage.hh,v 3.27 2007/12/11 16:44:20 rousse Exp $
+// $Id: NetworkMessage.hh,v 3.28 2007/12/13 14:43:04 rousse Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_NETWORK_MESSAGE_HH
@@ -304,6 +304,9 @@
// if the WriteBody method has to be called.
bool writeHeader(Socket *Socket);
+ // -- Others Private Write Methods --
+ void writeFEDid(MessageBody &body);
+
// -- Others Private Read Methods --
void readLabel(MessageBody &);
void readTag(MessageBody &);
@@ -322,4 +325,4 @@
#endif // CERTI_NETWORK_MESSAGE_HH
-// $Id: NetworkMessage.hh,v 3.27 2007/12/11 16:44:20 rousse Exp $
+// $Id: NetworkMessage.hh,v 3.28 2007/12/13 14:43:04 rousse Exp $
Index: NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.35
retrieving revision 3.36
diff -u -b -r3.35 -r3.36
--- NetworkMessage_RW.cc 11 Dec 2007 16:44:21 -0000 3.35
+++ NetworkMessage_RW.cc 13 Dec 2007 14:43:05 -0000 3.36
@@ -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_RW.cc,v 3.35 2007/12/11 16:44:21 rousse Exp $
+// $Id: NetworkMessage_RW.cc,v 3.36 2007/12/13 14:43:05 rousse Exp $
// ----------------------------------------------------------------------------
@@ -502,8 +502,7 @@
switch(Header.type) {
case GET_FED_FILE:
body.writeShortInt(number);
- body.writeShortInt(strlen(FEDid));
- body.writeString(FEDid);
+ writeFEDid(body);
if ( number >= 1 ) // open (0) and close (0) no more information
{
body.writeLongInt(ValueArray[0].length);
@@ -553,8 +552,7 @@
case CREATE_FEDERATION_EXECUTION:
body.writeString(federationName);
- body.writeShortInt(strlen(FEDid));
- body.writeString(FEDid);
+ writeFEDid(body);
break ;
case DESTROY_FEDERATION_EXECUTION:
@@ -983,4 +981,4 @@
} // namespace certi
-// $Id: NetworkMessage_RW.cc,v 3.35 2007/12/11 16:44:21 rousse Exp $
+// $Id: NetworkMessage_RW.cc,v 3.36 2007/12/13 14:43:05 rousse Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- certi/libCERTI Message.hh Message_W.cc NetworkM...,
certi-cvs <=