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

Timestamp:

Aug 4, 2009, 5:30:38 PM (15 years ago)

Author:

mies

Message:

 

File:

• source/ariba/overlay/modules/chord/Chord.cpp (modified) (4 diffs)

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

@@ -74 +74 @@
         logging_debug("Request to setup link to " << endp.toString() );
 
-        // check if node is already present
-        if (!node.isUnspecified() && table->get(node)!=NULL) {
-                logging_error("Node is already a neighbor!");
-                return LinkID::UNSPECIFIED;
-        }
-
         // check if we are already trying to establish a link
         for (size_t i=0; i<pending.size(); i++)
@@ -218 +212 @@
                 // all nodes that I know, fingers, succ/pred
                 for (size_t i = 0; i < table->size(); i++){
-                        if (/*(*table)[i]->ref_count != 0
-                                        &&*/ !(*table)[i]->info.isUnspecified())
+                        if ((*table)[i]->ref_count != 0
+                                        && !(*table)[i]->info.isUnspecified())
                                 nodelist.push_back((*table)[i]->id);
                 }
@@ -459 +453 @@
                 }
 
-
                 // remove orphan links
                 orphan_removal_counter++;
@@ -469 +462 @@
                                 if (it->ref_count == 0 && !it->info.isUnspecified()) {
                                         logging_info("Dropping orphaned link " << it->info.toString() << " to " << it->id.toString());
-//                                      baseoverlay.dropLink(it->info);
-//                                      it->info = LinkID::UNSPECIFIED;
+                                        baseoverlay.dropLink(it->info);
+                                        it->info = LinkID::UNSPECIFIED;
                                 }
                         }