Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5675)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5678)
@@ -74,4 +74,8 @@
 	logging_debug("Request to setup link to " << endp.toString() );
 
+	for (int i=0; i<table->size(); i++)
+		if ((*table)[i]->id == node && !((*table)[i]->info.isUnspecified()))
+			return LinkID::UNSPECIFIED;
+
 	// check if we are already trying to establish a link
 	for (size_t i=0; i<pending.size(); i++)
@@ -117,5 +121,5 @@
 		dmsg.setSourceEndpoint(&baseoverlay.getEndpointDescriptor());
 		dmsg.setFollowType(Discovery::successor);
-		dmsg.setTTL((uint8_t)3);
+		dmsg.setTTL((uint8_t)1);
 		cmsg.encapsulate(&dmsg);
 		send(&cmsg, lnk);
@@ -127,5 +131,5 @@
 		dmsg.setSourceEndpoint(&baseoverlay.getEndpointDescriptor());
 		dmsg.setFollowType(Discovery::predecessor);
-		dmsg.setTTL((uint8_t)3);
+		dmsg.setTTL((uint8_t)1);
 		cmsg.encapsulate(&dmsg);
 		send(&cmsg, lnk);
@@ -421,4 +425,5 @@
 	}
 	}
+	delete m;
 }