[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi/libCERTI ObjectClassBroadcastList.cc Secu...
From: |
certi-cvs |
Subject: |
[certi-cvs] certi/libCERTI ObjectClassBroadcastList.cc Secu... |
Date: |
Wed, 09 Jul 2008 15:04:26 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: ROUSSELOT <rousse> 08/07/09 15:04:26
Modified files:
libCERTI : ObjectClassBroadcastList.cc SecurityServer.cc
Log message:
#23755 BUG correction. Need more validation
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.cc?cvsroot=certi&r1=3.23&r2=3.24
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SecurityServer.cc?cvsroot=certi&r1=3.13&r2=3.14
Patches:
Index: ObjectClassBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.cc,v
retrieving revision 3.23
retrieving revision 3.24
diff -u -b -r3.23 -r3.24
--- ObjectClassBroadcastList.cc 24 Jun 2008 08:56:49 -0000 3.23
+++ ObjectClassBroadcastList.cc 9 Jul 2008 15:04:26 -0000 3.24
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.cc,v 3.23 2008/06/24 08:56:49 rousse Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.24 2008/07/09 15:04:26 rousse Exp $
// ----------------------------------------------------------------------------
@@ -260,6 +260,8 @@
"Broadcasting message to Federate %d.", (*i)->Federate);
try {
socket = server->getSocketLink((*i)->Federate);
+ // socket NULL means federate dead (killed ?)
+ if ( socket != NULL )
message->send(socket,NM_msgBufSend);
}
catch (RTIinternalError &e) {
@@ -365,9 +367,13 @@
#else
socket = server->getSocketLink((*i)->Federate);
#endif
+ // socket NULL means federate is dead (killed ?)
+ if ( socket != NULL )
+ {
G.Out(pdGendoc,"
sendPendingRAVMessage=====> write");
currentMessage->send(socket,NM_msgBufSend);
}
+ }
catch (RTIinternalError &e) {
D.Out(pdExcept,
"Reference to a killed Federate while broadcasting.");
@@ -401,4 +407,4 @@
} // namespace certi
-// $Id: ObjectClassBroadcastList.cc,v 3.23 2008/06/24 08:56:49 rousse Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.24 2008/07/09 15:04:26 rousse Exp $
Index: SecurityServer.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SecurityServer.cc,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- SecurityServer.cc 27 Jun 2008 09:54:47 -0000 3.13
+++ SecurityServer.cc 9 Jul 2008 15:04:26 -0000 3.14
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: SecurityServer.cc,v 3.13 2008/06/27 09:54:47 rousse Exp $
+// $Id: SecurityServer.cc,v 3.14 2008/07/09 15:04:26 rousse Exp $
// ----------------------------------------------------------------------------
@@ -46,7 +46,12 @@
TransportType theType) const
{
// G.Out(pdGendoc,"into SecurityServer::getSocketLink");
- return RTIG_SocketServer.getSocketLink(myFederation, theFederate, theType);
+Socket * sock = RTIG_SocketServer.getSocketLink(myFederation, theFederate,
theType);
+if ( sock == NULL )
+ // Federate killed
+ return NULL ;
+else
+ return sock ;
}
// ----------------------------------------------------------------------------
@@ -192,4 +197,4 @@
}
-// $Id: SecurityServer.cc,v 3.13 2008/06/27 09:54:47 rousse Exp $
+// $Id: SecurityServer.cc,v 3.14 2008/07/09 15:04:26 rousse Exp $
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi/libCERTI ObjectClassBroadcastList.cc Secu...,
certi-cvs <=