Changeset 5776 for source/ariba/overlay/modules

Timestamp:

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

Author:

mies

Message:

 

Location:

source/ariba/overlay/modules/chord

Files:

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

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;
         }