Changeset 5642

Timestamp:

Aug 4, 2009, 10:47:35 AM (15 years ago)

Author:

mies

Message:

 

File:

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

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

@@ -71 +71 @@
 /// helper: sets up a link using the base overlay
 LinkID Chord::setup(const EndpointDescriptor& endp, const NodeID& node) {
-
-        logging_debug("request to setup link to " << endp.toString() );
-
+        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++)
-                if (pending[i]==node) return LinkID::UNSPECIFIED;
-        pending.push_back(node);
+                if ( pending[i] == node ) {
+                        logging_debug("Already trying to establish a link to node " << node.toString() );
+                        return LinkID::UNSPECIFIED;
+                }
+
+        // adding node to list of pending connections
+        pending.push_back( node );
 
         // establish link via base overlay