Changeset 5487 for source

Timestamp:

Jul 30, 2009, 4:18:17 PM (15 years ago)

Author:

mies

Message:

 

File:

• source/ariba/overlay/BaseOverlay.cpp (modified) (2 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -205 +205 @@
 seqnum_t BaseOverlay::sendOverlay( Message* message, const NodeID& nodeid ) {
         for (size_t i=0; i<links.size(); i++)
-                if ( links[i]->up &&
-                links[i]->communicationUp &&
-                !links[i]->relay &&
-                links[i]->keepAliveMissed <= 1 &&
-                links[i]->remoteNode == nodeid &&
-                links[i]->service == OverlayInterface::OVERLAY_SERVICE_ID) {
+                if ( !links[i]->relay &&
+                        links[i]->up &&
+                        links[i]->communicationUp &&
+                        links[i]->keepAliveMissed <= 1 &&
+                        links[i]->remoteNode == nodeid &&
+                        links[i]->service == OverlayInterface::OVERLAY_SERVICE_ID) {
+                        links[i]->markAsRelay();
                         return sendMessage( message, links[i] );
                         break;
@@ -1574 +1575 @@
         BOOST_FOREACH( const LinkDescriptor* ld, oldlinks ) {
 
+                if (ld->up!=1) continue;
+
                 vector<LinkID>::iterator it = std::find(
                                 bootstrapLinks.begin(), bootstrapLinks.end(), ld->communicationId);