[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi libCERTI/BasicMessage.hh libCERTI/Message...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi libCERTI/BasicMessage.hh libCERTI/Message... |
|
Date: |
Fri, 30 May 2008 09:49:18 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: ROUSSELOT <rousse> 08/05/30 09:49:18
Modified files:
libCERTI : BasicMessage.hh Message.hh Message_R.cc
Message_W.cc
libRTI : RTIambassador.cc
Log message:
#23329 BUG continued and to be continued
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BasicMessage.hh?cvsroot=certi&r1=3.10&r2=3.11
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.hh?cvsroot=certi&r1=3.45&r2=3.46
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.24&r2=3.25
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.28&r2=3.29
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.82&r2=3.83
Patches:
Index: libCERTI/BasicMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/BasicMessage.hh,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -b -r3.10 -r3.11
--- libCERTI/BasicMessage.hh 29 May 2008 12:20:36 -0000 3.10
+++ libCERTI/BasicMessage.hh 30 May 2008 09:49:17 -0000 3.11
@@ -19,14 +19,13 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: BasicMessage.hh,v 3.10 2008/05/29 12:20:36 rousse Exp $
+// $Id: BasicMessage.hh,v 3.11 2008/05/30 09:49:17 rousse Exp $
// ----------------------------------------------------------------------------
#ifndef LIBCERTI_BASIC_MESSAGE
#define LIBCERTI_BASIC_MESSAGE
#include "Extent.hh"
-#include "MessageBody.hh"
#include "MessageBuffer.hh"
#include "BaseRegion.hh"
#include <vector>
@@ -75,4 +74,4 @@
#endif // LIBCERTI_BASIC_MESSAGE
-// $Id: BasicMessage.hh,v 3.10 2008/05/29 12:20:36 rousse Exp $
+// $Id: BasicMessage.hh,v 3.11 2008/05/30 09:49:17 rousse Exp $
Index: libCERTI/Message.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.hh,v
retrieving revision 3.45
retrieving revision 3.46
diff -u -b -r3.45 -r3.46
--- libCERTI/Message.hh 29 May 2008 12:20:37 -0000 3.45
+++ libCERTI/Message.hh 30 May 2008 09:49:17 -0000 3.46
@@ -24,7 +24,6 @@
#include "Exception.hh"
#include "SocketUN.hh"
-#include "MessageBody.hh"
#include "BasicMessage.hh"
#include "fedtime.hh"
@@ -266,10 +265,6 @@
void trace(const char* context);
- // Read and Write NetworkMessage Objects to and from Socket objects.
- void write(SocketUN *Socket, MessageBuffer& msgBuffer) throw
(NetworkError, NetworkSignal);
- void read(SocketUN *Socket) throw (NetworkError, NetworkSignal);
-
// -- Attribute Access Methods
// Value Array Management
// setValue : Value and its length are stored into valueArray[Rank]
@@ -459,10 +454,8 @@
// ReadHeader.
void readBody(MessageBuffer &msgBuffer);
- // Read a Header from a socket, and process it to read its
- // content. Return RTI_TRUE if the ReadBody Method has to be
- // called.
- bool readHeader(MessageBuffer &msgBuffer);
+ // Read a Header (buffer beginning)
+ void readHeader(MessageBuffer &msgBuffer);
// The message is written onto the socket by WriteHeader if no
// body is required, or by WriteBody is a body has been required
@@ -472,9 +465,8 @@
// WriteHeader.
void writeBody(MessageBuffer &msgBuffer);
- // Prepare and Write a Header to a Socket, and return RTI_TRUE if
- // the WriteBody method has to be called.
- bool writeHeader(MessageBuffer &msgBuffer);
+ // Write a Header (buffer beginning)
+ void writeHeader(MessageBuffer &msgBuffer);
// -- Other Private Read Methods --
void readHandleArray(MessageBuffer &msgBuffer);
Index: libCERTI/Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -b -r3.24 -r3.25
--- libCERTI/Message_R.cc 29 May 2008 12:20:37 -0000 3.24
+++ libCERTI/Message_R.cc 30 May 2008 09:49:17 -0000 3.25
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_R.cc,v 3.24 2008/05/29 12:20:37 rousse Exp $
+// $Id: Message_R.cc,v 3.25 2008/05/30 09:49:17 rousse Exp $
// ----------------------------------------------------------------------------
@@ -491,8 +491,16 @@
readHandleArray(msgBuffer);
break ;
- // -- Default Handler --
+ // lookahead got from header
+ // Warning : FederationTime has been modified (needs validation)
+ case MODIFY_LOOKAHEAD:
+ case QUERY_LOOKAHEAD:
+ // we get another time but is the lookahead
+ lookahead = msgBuffer.read_double();
+ fed_time.setZero();
+ break ;
+ // -- Default Handler --
default:
G.Out(pdGendoc,"exit Message::readBody with nothing to do");
@@ -502,18 +510,15 @@
}
// ----------------------------------------------------------------------------
-/*! Read a Header from a socket, and process it to read its content. Return
- RTI_TRUE if the ReadBody Method has to be called.
+/*! Read a Header Message
*/
-bool
+void
Message::readHeader(MessageBuffer &msgBuffer)
{
G.Out(pdGendoc,"enter Message::readHeader");
- // 1- Read Header from Socket
- //socket->receive((const unsigned char *) &header, sizeof(MessageHeader));
+ // 1- get Header (not a really header but buffer beginning)
- // 2- Parse Header
type = (Type)msgBuffer.read_int32() ;
exception = (TypeException)msgBuffer.read_int32();
setFederationTime(msgBuffer.read_double());
@@ -525,172 +530,10 @@
if (exception != e_NO_EXCEPTION)
{
G.Out(pdGendoc,"exit Message::readHeader carrying an exception");
- return true ;
+ return ;
}
- // 2- Determine if body exists or not
- // NULL, UAV and SendInteraction are the most common ones.
-
- switch(type) {
-
- // ------------------ BODY NOT EMPTY -----------------------------------
-
-
- // ------- federationTime not useful
- case CREATE_FEDERATION_EXECUTION:
- case DESTROY_FEDERATION_EXECUTION:
- case REGISTER_FEDERATION_SYNCHRONIZATION_POINT:
- case SYNCHRONIZATION_POINT_REGISTRATION_FAILED:
- case SYNCHRONIZATION_POINT_REGISTRATION_SUCCEEDED:
- case ANNOUNCE_SYNCHRONIZATION_POINT:
- case SYNCHRONIZATION_POINT_ACHIEVED:
- case FEDERATION_SYNCHRONIZED:
- case IS_ATTRIBUTE_OWNED_BY_FEDERATE:
- case QUERY_ATTRIBUTE_OWNERSHIP:
- case ATTRIBUTE_IS_NOT_OWNED:
- case INFORM_ATTRIBUTE_OWNERSHIP:
- case NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE:
- case REQUEST_ATTRIBUTE_OWNERSHIP_ASSUMPTION:
- case ATTRIBUTE_OWNERSHIP_ACQUISITION_IF_AVAILABLE:
- case ATTRIBUTE_OWNERSHIP_ACQUISITION_NOTIFICATION:
- case ATTRIBUTE_OWNERSHIP_UNAVAILABLE:
- case UNCONDITIONAL_ATTRIBUTE_OWNERSHIP_DIVESTITURE:
- case ATTRIBUTE_OWNERSHIP_ACQUISITION:
- case REQUEST_ATTRIBUTE_OWNERSHIP_RELEASE:
- case ATTRIBUTE_OWNERSHIP_DIVESTITURE_NOTIFICATION:
- case CANCEL_NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE:
- case ATTRIBUTE_OWNERSHIP_RELEASE_RESPONSE:
- case CANCEL_ATTRIBUTE_OWNERSHIP_ACQUISITION:
- case CONFIRM_ATTRIBUTE_OWNERSHIP_ACQUISITION_CANCELLATION:
- case GET_ATTRIBUTE_SPACE_HANDLE:
- case GET_INTERACTION_SPACE_HANDLE:
- case INITIATE_FEDERATE_SAVE:
- case DDM_CREATE_REGION:
- case DDM_ASSOCIATE_REGION:
- case DDM_UNASSOCIATE_REGION:
- case DDM_SUBSCRIBE_ATTRIBUTES:
- case DDM_UNSUBSCRIBE_ATTRIBUTES:
- case DDM_SUBSCRIBE_INTERACTION:
- case DDM_UNSUBSCRIBE_INTERACTION:
- case DDM_REGISTER_OBJECT:
- case REQUEST_FEDERATION_RESTORE:
- case REQUEST_FEDERATION_RESTORE_SUCCEEDED:
- case REQUEST_FEDERATION_RESTORE_FAILED:
- case REQUEST_OBJECT_ATTRIBUTE_VALUE_UPDATE:
- case RESIGN_FEDERATION_EXECUTION:
- case INITIATE_FEDERATE_RESTORE:
- case JOIN_FEDERATION_EXECUTION:
- case UNPUBLISH_OBJECT_CLASS:
- case UNSUBSCRIBE_OBJECT_CLASS:
- case START_REGISTRATION_FOR_OBJECT_CLASS:
- case STOP_REGISTRATION_FOR_OBJECT_CLASS:
- case PUBLISH_INTERACTION_CLASS:
- case UNPUBLISH_INTERACTION_CLASS:
- case SUBSCRIBE_INTERACTION_CLASS:
- case UNSUBSCRIBE_INTERACTION_CLASS:
- case TURN_INTERACTIONS_ON:
- case TURN_INTERACTIONS_OFF:
- case LOCAL_DELETE_OBJECT_INSTANCE:
- case CHANGE_INTERACTION_TRANSPORTATION_TYPE:
- case CHANGE_INTERACTION_ORDER_TYPE:
- case DDM_DELETE_REGION:
- case DDM_MODIFY_REGION:
- case CHANGE_ATTRIBUTE_TRANSPORTATION_TYPE:
- case CHANGE_ATTRIBUTE_ORDER_TYPE:
- case ENABLE_TIME_REGULATION:
- case DISABLE_TIME_REGULATION:
- case ENABLE_TIME_CONSTRAINED:
- case DISABLE_TIME_CONSTRAINED:
- case REQUEST_CLASS_ATTRIBUTE_VALUE_UPDATE:
- case PROVIDE_ATTRIBUTE_VALUE_UPDATE:
- case TICK_REQUEST:
- break ;
-
- // ------- federationTime (relevant or zero) depending on boolean value
- // i.e. boolean false don't need date (zero received in header)
- case REQUEST_FEDERATION_SAVE:
- case UPDATE_ATTRIBUTE_VALUES:
- case REFLECT_ATTRIBUTE_VALUES:
- case SEND_INTERACTION:
- case RECEIVE_INTERACTION:
- break ;
-
- // ------- federationTime useful
- case PUBLISH_OBJECT_CLASS:
- case SUBSCRIBE_OBJECT_CLASS_ATTRIBUTES:
- case REGISTER_OBJECT_INSTANCE:
- case DELETE_OBJECT_INSTANCE:
- case REMOVE_OBJECT_INSTANCE:
- case DISCOVER_OBJECT_INSTANCE:
- case GET_OBJECT_CLASS_HANDLE:
- case GET_OBJECT_CLASS_NAME:
- case GET_OBJECT_CLASS:
- case GET_ATTRIBUTE_HANDLE:
- case GET_ATTRIBUTE_NAME:
- case GET_INTERACTION_CLASS_HANDLE:
- case GET_INTERACTION_CLASS_NAME:
- case GET_PARAMETER_HANDLE:
- case GET_PARAMETER_NAME:
- case GET_SPACE_HANDLE:
- case GET_SPACE_NAME:
- case GET_DIMENSION_NAME:
- case GET_DIMENSION_HANDLE:
- case GET_OBJECT_INSTANCE_HANDLE:
- case GET_OBJECT_INSTANCE_NAME:
- break ;
-
- // ------------------ BODY EMPTY -----------------------------------
- // type,exception,size ans federationTime yet got from header
-
- // ------- federationTime not useful
- case FEDERATE_SAVE_BEGUN:
- case FEDERATE_SAVE_COMPLETE:
- case FEDERATE_SAVE_NOT_COMPLETE:
- case FEDERATION_SAVED:
- case FEDERATION_NOT_SAVED:
- case FEDERATE_RESTORE_COMPLETE:
- case FEDERATE_RESTORE_NOT_COMPLETE:
- case FEDERATION_RESTORED:
- case FEDERATION_NOT_RESTORED:
- case FEDERATION_RESTORE_BEGUN:
- case ENABLE_ASYNCHRONOUS_DELIVERY:
- case DISABLE_ASYNCHRONOUS_DELIVERY:
- case TICK_REQUEST_NEXT:
- break ;
-
- // ------- federationTime useful
- case QUERY_LBTS:
- case QUERY_MIN_NEXT_EVENT_TIME:
- case QUERY_FEDERATE_TIME:
- case TIME_ADVANCE_REQUEST:
- case TIME_ADVANCE_REQUEST_AVAILABLE:
- case NEXT_EVENT_REQUEST:
- case NEXT_EVENT_REQUEST_AVAILABLE:
- case TIME_ADVANCE_GRANT:
- case TIME_REGULATION_ENABLED:
- case TIME_CONSTRAINED_ENABLED:
- break ;
-
- // lookahead got from header
- // Warning : FederationTime has been modified (needs validation)
- case MODIFY_LOOKAHEAD:
- case QUERY_LOOKAHEAD:
- // we get another time but is the lookahead
- lookahead = msgBuffer.read_double();
- fed_time.setZero();
- break ;
-
- default:
- D.Out(pdExcept, "Unknown type %d in ReadHeader.", type);
- G.Out(pdGendoc,"exit Message::readHeader on RTIinternalError unknown
type");
- throw RTIinternalError("Message: Received unknown Header type.");
- }
-
- // 4- Return depends on body
G.Out(pdGendoc,"exit Message::readHeader");
-
- //return header.bodySize != 0 ;
- return 0 ;
}
// ----------------------------------------------------------------------------
@@ -773,4 +616,4 @@
} // namespace certi
-// $Id: Message_R.cc,v 3.24 2008/05/29 12:20:37 rousse Exp $
+// $Id: Message_R.cc,v 3.25 2008/05/30 09:49:17 rousse Exp $
Index: libCERTI/Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.28
retrieving revision 3.29
diff -u -b -r3.28 -r3.29
--- libCERTI/Message_W.cc 29 May 2008 12:20:38 -0000 3.28
+++ libCERTI/Message_W.cc 30 May 2008 09:49:17 -0000 3.29
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_W.cc,v 3.28 2008/05/29 12:20:38 rousse Exp $
+// $Id: Message_W.cc,v 3.29 2008/05/30 09:49:17 rousse Exp $
// ----------------------------------------------------------------------------
@@ -511,12 +511,9 @@
}
// ----------------------------------------------------------------------------
-/*! Prepare and Write a Header to a Socket, and return RTI_TRUE if the
- WriteBody method has to be called.
- The message is written onto the socket by WriteHeader if no body is
- required, or by WriteBody is a body has been required by WriteHeader.
+/*! Prepare the Message Header
*/
-bool
+void
Message::writeHeader(MessageBuffer &msgBuffer)
{
G.Out(pdGendoc,"enter Message::writeHeader");
@@ -529,191 +526,12 @@
// If the message carry an exception, the Body will only contain the
// exception reason.
- D.Out(pdDebug,"Sent message type <%d> ",type);
if (exception != e_NO_EXCEPTION) {
G.Out(pdGendoc,"exit Message::writeHeader carrying exception");
- return true ;
- }
-
- // 3- Determine if body exists or not
- // Note: Header.bodySize is not set to the actual Body size, but
- // to zero to indicate there is no Body, or 1 if a Body is needed.
-
- switch(this->type) {
-
- // ------------------ BODY NOT EMPTY -----------------------------------
-
- // ------- federationTime not useful
- case CREATE_FEDERATION_EXECUTION:
- case DESTROY_FEDERATION_EXECUTION:
- case REGISTER_FEDERATION_SYNCHRONIZATION_POINT:
- case SYNCHRONIZATION_POINT_REGISTRATION_FAILED:
- case SYNCHRONIZATION_POINT_REGISTRATION_SUCCEEDED:
- case ANNOUNCE_SYNCHRONIZATION_POINT:
- case SYNCHRONIZATION_POINT_ACHIEVED:
- case FEDERATION_SYNCHRONIZED:
- case IS_ATTRIBUTE_OWNED_BY_FEDERATE:
- case QUERY_ATTRIBUTE_OWNERSHIP:
- case ATTRIBUTE_IS_NOT_OWNED:
- case INFORM_ATTRIBUTE_OWNERSHIP:
- case NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE:
- case REQUEST_ATTRIBUTE_OWNERSHIP_ASSUMPTION:
- case ATTRIBUTE_OWNERSHIP_ACQUISITION_IF_AVAILABLE:
- case ATTRIBUTE_OWNERSHIP_ACQUISITION_NOTIFICATION:
- case ATTRIBUTE_OWNERSHIP_UNAVAILABLE:
- case UNCONDITIONAL_ATTRIBUTE_OWNERSHIP_DIVESTITURE:
- case ATTRIBUTE_OWNERSHIP_ACQUISITION:
- case REQUEST_ATTRIBUTE_OWNERSHIP_RELEASE:
- case ATTRIBUTE_OWNERSHIP_DIVESTITURE_NOTIFICATION:
- case CANCEL_NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE:
- case ATTRIBUTE_OWNERSHIP_RELEASE_RESPONSE:
- case CANCEL_ATTRIBUTE_OWNERSHIP_ACQUISITION:
- case CONFIRM_ATTRIBUTE_OWNERSHIP_ACQUISITION_CANCELLATION:
- case GET_ATTRIBUTE_SPACE_HANDLE:
- case GET_INTERACTION_SPACE_HANDLE:
- case INITIATE_FEDERATE_SAVE:
- case DDM_CREATE_REGION:
- case DDM_ASSOCIATE_REGION:
- case DDM_UNASSOCIATE_REGION:
- case DDM_SUBSCRIBE_ATTRIBUTES:
- case DDM_UNSUBSCRIBE_ATTRIBUTES:
- case DDM_SUBSCRIBE_INTERACTION:
- case DDM_UNSUBSCRIBE_INTERACTION:
- case DDM_REGISTER_OBJECT:
- case REQUEST_FEDERATION_RESTORE:
- case REQUEST_FEDERATION_RESTORE_SUCCEEDED:
- case REQUEST_FEDERATION_RESTORE_FAILED:
- case REQUEST_OBJECT_ATTRIBUTE_VALUE_UPDATE:
- case RESIGN_FEDERATION_EXECUTION:
- case INITIATE_FEDERATE_RESTORE:
- case JOIN_FEDERATION_EXECUTION:
- case UNPUBLISH_OBJECT_CLASS:
- case UNSUBSCRIBE_OBJECT_CLASS:
- case START_REGISTRATION_FOR_OBJECT_CLASS:
- case STOP_REGISTRATION_FOR_OBJECT_CLASS:
- case PUBLISH_INTERACTION_CLASS:
- case UNPUBLISH_INTERACTION_CLASS:
- case SUBSCRIBE_INTERACTION_CLASS:
- case UNSUBSCRIBE_INTERACTION_CLASS:
- case TURN_INTERACTIONS_ON:
- case TURN_INTERACTIONS_OFF:
- case LOCAL_DELETE_OBJECT_INSTANCE:
- case CHANGE_INTERACTION_TRANSPORTATION_TYPE:
- case CHANGE_INTERACTION_ORDER_TYPE:
- case DDM_DELETE_REGION:
- case DDM_MODIFY_REGION:
- case CHANGE_ATTRIBUTE_TRANSPORTATION_TYPE:
- case CHANGE_ATTRIBUTE_ORDER_TYPE:
- case ENABLE_TIME_REGULATION:
- case DISABLE_TIME_REGULATION:
- case ENABLE_TIME_CONSTRAINED:
- case DISABLE_TIME_CONSTRAINED:
- case REQUEST_CLASS_ATTRIBUTE_VALUE_UPDATE:
- case PROVIDE_ATTRIBUTE_VALUE_UPDATE:
- case TICK_REQUEST:
- //header.bodySize = 1 ;
- break ;
-
- // ------- federationTime (relevant or zero) depending on boolean value
- // i.e. boolean false don't need date.
- case REQUEST_FEDERATION_SAVE:
- case UPDATE_ATTRIBUTE_VALUES:
- case REFLECT_ATTRIBUTE_VALUES:
- case SEND_INTERACTION:
- case RECEIVE_INTERACTION:
- //if ( ! boolean )
- //{
- //msgBuffer.write_double(0);
- //header.date = 0 ;
- //}
- //header.bodySize = 1 ;
- break ;
-
- // ------- federationTime useful
- case PUBLISH_OBJECT_CLASS:
- case SUBSCRIBE_OBJECT_CLASS_ATTRIBUTES:
- case REGISTER_OBJECT_INSTANCE:
- case DELETE_OBJECT_INSTANCE:
- case REMOVE_OBJECT_INSTANCE:
- case DISCOVER_OBJECT_INSTANCE:
- case GET_OBJECT_CLASS_HANDLE:
- case GET_OBJECT_CLASS_NAME:
- case GET_OBJECT_CLASS:
- case GET_ATTRIBUTE_HANDLE:
- case GET_ATTRIBUTE_NAME:
- case GET_INTERACTION_CLASS_HANDLE:
- case GET_INTERACTION_CLASS_NAME:
- case GET_PARAMETER_HANDLE:
- case GET_PARAMETER_NAME:
- case GET_SPACE_HANDLE:
- case GET_SPACE_NAME:
- case GET_DIMENSION_HANDLE:
- case GET_DIMENSION_NAME:
- case GET_OBJECT_INSTANCE_HANDLE:
- case GET_OBJECT_INSTANCE_NAME:
- //header.bodySize = 1 ;
- break ;
-
- // --------------------- BODY EMPTY ----------------------------
- // Header yet contains type,exception,size and federationTime.
-
- // ------- federationTime not useful
- case FEDERATE_SAVE_BEGUN:
- case FEDERATE_SAVE_COMPLETE:
- case FEDERATE_SAVE_NOT_COMPLETE:
- case FEDERATION_SAVED:
- case FEDERATION_NOT_SAVED:
- case FEDERATE_RESTORE_COMPLETE:
- case FEDERATE_RESTORE_NOT_COMPLETE:
- case FEDERATION_RESTORED:
- case FEDERATION_NOT_RESTORED:
- case FEDERATION_RESTORE_BEGUN:
- case ENABLE_ASYNCHRONOUS_DELIVERY:
- case DISABLE_ASYNCHRONOUS_DELIVERY:
- case TICK_REQUEST_NEXT:
- //header.bodySize = 0 ;
- break ;
-
- // ------- federationTime useful
- case QUERY_LBTS:
- case QUERY_MIN_NEXT_EVENT_TIME:
- case QUERY_FEDERATE_TIME:
- case TIME_ADVANCE_REQUEST:
- case TIME_ADVANCE_REQUEST_AVAILABLE:
- case NEXT_EVENT_REQUEST:
- case NEXT_EVENT_REQUEST_AVAILABLE:
- case TIME_ADVANCE_GRANT:
- case TIME_REGULATION_ENABLED:
- case TIME_CONSTRAINED_ENABLED:
- //header.bodySize = 0 ;
- break ;
-
- // federationTime yet put in header
- // We store lookahead in place
- case MODIFY_LOOKAHEAD:
- case QUERY_LOOKAHEAD:
- //header.date = lookahead ;
- // we store another time but is the lookahead
- msgBuffer.write_double(lookahead);
- //header.bodySize = 0 ;
- break ;
-
- // -- Default Handler --
- default:
- // Nothing to do
- G.Out(pdGendoc,"exit Message::writeHeader with nothing to do");
- return 0;
-
+ return ;
}
- // 4- If Header.bodySize = 0, send message and return RTI_FALSE,
- // Else send nothing(will be done by WriteBody), and return RTI_TRUE.
- //if (header.bodySize == 0)
- //socket->send((const unsigned char *) &header, sizeof(MessageHeader));
-
G.Out(pdGendoc,"exit Message::writeHeader");
- //return header.bodySize != 0 ;
- return 0;
}
// ---------------------------------------------------------------
@@ -752,4 +570,4 @@
} // namespace certi
-// $Id: Message_W.cc,v 3.28 2008/05/29 12:20:38 rousse Exp $
+// $Id: Message_W.cc,v 3.29 2008/05/30 09:49:17 rousse Exp $
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.82
retrieving revision 3.83
diff -u -b -r3.82 -r3.83
--- libRTI/RTIambassador.cc 29 May 2008 12:20:40 -0000 3.82
+++ libRTI/RTIambassador.cc 30 May 2008 09:49:18 -0000 3.83
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.82 2008/05/29 12:20:40 rousse Exp $
+// $Id: RTIambassador.cc,v 3.83 2008/05/30 09:49:18 rousse Exp $
// ----------------------------------------------------------------------------
@@ -248,7 +248,6 @@
vers_RTI.setMaxTickTime(maximum);
try {
- //vers_RTI.write(privateRefs->socketUn);
vers_RTI.send(privateRefs->socketUn,privateRefs->msgBufSend);
}
catch (NetworkError) {
@@ -2959,4 +2958,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.82 2008/05/29 12:20:40 rousse Exp $
+// $Id: RTIambassador.cc,v 3.83 2008/05/30 09:49:18 rousse Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi libCERTI/BasicMessage.hh libCERTI/Message...,
certi-cvs <=