Changeset 5554 for source

Timestamp:

Jul 31, 2009, 7:02:23 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (2 diffs)
• BaseOverlay.h (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -205 +205 @@
 }
 
-LinkDescriptor* BaseOverlay::getSendDescriptor( const NodeID& nodeid ) {
+LinkDescriptor* BaseOverlay::getSendDescriptor( const NodeID& nodeid, bool follow ) {
         for (size_t i=0; i<links.size(); i++)
                 if ( !links[i]->relay &&
@@ -216 +216 @@
                 }
         LinkDescriptor* ld = getDescriptor(overlayInterface->getNextLinkId(nodeid));
-        if (ld != NULL && ld->relay)
-                return getRelayDescriptor(ld->localRelay);
+        if (ld != NULL && ld->relay && follow)
+                return getSendDescriptor(ld->localRelay, false);
         return NULL;
 }

source/ariba/overlay/BaseOverlay.h

@@ -420 +420 @@
         seqnum_t sendMessage( Message* message, const LinkDescriptor* ld );
 
-        LinkDescriptor* getSendDescriptor( const NodeID& nodeid );
+        LinkDescriptor* getSendDescriptor( const NodeID& nodeid, bool follow = false );
 
         /// routes a message over the overlay or directly sends it when a link is open