Changeset 5882 for source/ariba

Timestamp:

Aug 12, 2009, 12:46:17 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (5 diffs)
• BaseOverlay.h (modified) (1 diff)
• modules/chord/Chord.cpp (modified) (2 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -230 +230 @@
 
 /// routes a message to its destination node
-void BaseOverlay::route( OverlayMsg* message, LinkDescriptor* incomingLink ) {
+void BaseOverlay::route( OverlayMsg* message ) {
 
         // exceeded time-to-live? yes-> drop message
@@ -241 +241 @@
                 // destinastion myself? yes-> handle message
                 if (message->getDestinationNode() == nodeId)
-                        handleMessage( message, incomingLink );
+                        handleMessage( message, NULL );
                 else
                         // no->send message to next hop
@@ -392 +392 @@
                 || ld->relayed
                 || !message->isRelayed()
-                || !(message->getService() == OverlayInterface::OVERLAY_SERVICE_ID)
+//              || !(message->getService() == OverlayInterface::OVERLAY_SERVICE_ID)
                 || message->getSourceNode()==nodeId ) return;
 
@@ -718 +718 @@
                 // erase descriptor
                 eraseDescriptor( ld->overlayId );
-        } else
+        } else {
                 ld->dropAfterRelaying = true;
+        }
 }
 
@@ -1496 +1497 @@
                 );
 
-                route( overlayMsg, ld );
+                route( overlayMsg );
                 delete overlayMsg;
                 return true;

source/ariba/overlay/BaseOverlay.h

@@ -467 +467 @@
 
         /// routes a message to its destination node
-        void route( OverlayMsg* message, LinkDescriptor* incomingLink );
+        void route( OverlayMsg* message );
 
         /// sends a raw message to another node, delivers it to the base overlay class

source/ariba/overlay/modules/chord/Chord.cpp

@@ -340 +340 @@
                         // no-> route message
                         else {
-                                baseoverlay.send( m, m->getDestinationNode() );
+                                baseoverlay.route( m );
                         }
                         break;
@@ -349 +349 @@
                 case Discovery::predecessor: {
                         // reached destination? no->forward!
-                        if (m->getDestinationNode() != nodeid && !table->is_closest_to(m->getDestinationNode())) {
+                        if (m->getDestinationNode() != nodeid) {
                                 OverlayMsg omsg(*m);
                                 omsg.encapsulate(dmsg);