Changeset 7744 for source/ariba/overlay/modules/chord

Timestamp:

Mar 11, 2010, 9:28:24 AM (14 years ago)

Author:

Christoph Mayer

Message:

-branch merge back

File:

• source/ariba/overlay/modules/chord/Chord.cpp (modified) (1 diff)

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

@@ -250 +250 @@
                 logging_info("new routing neighbor: " << remote.toString()
                                 << " with link " << lnk.toString());
-                // replace with new link
-                if (item->info!=lnk && item->info.isUnspecified()==false)
-                        baseoverlay.dropLink(item->info);
-                item->info = lnk;
+
+                // replace with new link if link is "better"
+                if (item->info!=lnk && item->info.isUnspecified()==false) {
+                        if (baseoverlay.compare( item->info, lnk ) == 1) {
+                                logging_info("Replacing link due to concurrent link establishment.");
+                                baseoverlay.dropLink(item->info);
+                                item->info = lnk;
+                        }
+                } else {
+                        item->info = lnk;
+                }
 
                 // discover neighbors of new overlay neighbor