Changeset 5776

Timestamp:

Aug 7, 2009, 12:55:13 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (4 diffs)
• modules/chord/Chord.cpp (modified) (4 diffs)
• modules/chord/messages/ChordMessage.h (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -1394 +1394 @@
                         RelayMessage* relayMsg = overlayMsg->decapsulate<RelayMessage>();
 
+                        // mark incoming link as relay
+                        if (ld!=NULL) ld->markAsRelay();
+
+                        // am I the destination of this message? yes->
+                        if (relayMsg->getDestNode() == nodeId ) {
+                                // deliver relay message locally!
+                                logging_debug("Relay message reached destination. Handling the message.");
+                                handleMessage( relayMsg, relayMsg->getDestLink(), LinkID::UNSPECIFIED, remoteNode );
+                                ret = true;
+                                break;
+                        }
+
                         // is relay message informative?
                         switch (relayMsg->getType()) {
@@ -1402 +1414 @@
                                                         << " relay " << relayMsg->getRelayNode()
                                                         << " destination " << relayMsg->getDestNode() );
-
-                                        // mark incoming link as relay
-                                        if (ld!=NULL) ld->markAsRelay();
-
-                                        // am I the destination of this message? yes->
-                                        if (relayMsg->getDestNode() == nodeId ) {
-                                                // deliver relay message locally!
-                                                logging_debug("Relay message reached destination. Handling the message.");
-                                                handleMessage( relayMsg, relayMsg->getDestLink(), LinkID::UNSPECIFIED, remoteNode );
-                                                ret = true;
-                                                break;
-                                        }
 
                                         // create route message
@@ -1426 +1426 @@
                                         } else {
                                                 logging_info("Routing relay message to " << relayMsg->getRelayNode().toString() );
-                                                sendOverlay( &_overMsg, relayMsg->getRelayNode() );
+//                                              sendOverlay( &_overMsg, relayMsg->getRelayNode() );
+                                                sendOverlay( &_overMsg, relayMsg->getDestNode() );
                                         }
                                         ret = true;
@@ -1437 +1438 @@
                                                         << " relay " << relayMsg->getRelayNode()
                                                         << " destination " << relayMsg->getDestNode() );
-
-                                        // mark incoming link as relay
-                                        if (ld!=NULL) ld->markAsRelay();
-
-                                        // am I the destination of this message? yes->
-                                        if (relayMsg->getDestNode() == nodeId ) {
-                                                // deliver relay message locally!
-                                                logging_debug("Relay message reached destination. Handling the message.");
-                                                handleMessage( relayMsg, relayMsg->getDestLink(), LinkID::UNSPECIFIED, remoteNode );
-                                                ret = true;
-                                                break;
-                                        }
 
                                         // am I the relay for this message? yes->

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

@@ -92 +92 @@
 
         // establish link via base overlay
-        return baseoverlay.establishLink(endp, node, OverlayInterface::OVERLAY_SERVICE_ID, remoteRelay );
+        return baseoverlay.establishLink(endp, node, OverlayInterface::OVERLAY_SERVICE_ID,
+                        NodeID::UNSPECIFIED );
 }
 
@@ -377 +378 @@
                                         logging_debug("Discovery split: routing discovery message to successor "
                                                         << succ_item->id.toString() );
+                                        cmsg_s.setDestination(succ_item->id);
                                         send(&cmsg_s, succ_item->info);
                                 }
@@ -390 +392 @@
                                         logging_debug("Discovery split: routing discovery message to predecessor "
                                                         << pred_item->id.toString() );
+                                        cmsg_p.setDestination(pred_item->id);
                                         send(&cmsg_p, pred_item->info);
                                 }
@@ -484 +487 @@
                 orphan_removal_counter++;
                 if (orphan_removal_counter <0 || orphan_removal_counter >= 4) {
-                        back_routes.clear();
+                        for (vector<back_route>::iterator i = back_routes.begin();
+                                        i!=back_routes.end(); i++) {
+                                back_route& br = *i;
+                                if (difftime(br.lastseen,time(NULL))>5) i =
+                                                back_routes.erase(i);
+                        }
                         logging_info("Running orphan removal");
                         orphan_removal_counter = 0;

source/ariba/overlay/modules/chord/messages/ChordMessage.h

@@ -88 +88 @@
         }
 
+        void setSource(const NodeID& source ) {
+                this->source = source;
+        }
+
         const NodeID& getSource() const {
                 return source;
+        }
+
+        void setDestination(const NodeID& destination ) {
+                this->destination = destination;
         }