Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5642)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5644)
@@ -59,4 +59,5 @@
 	this->table = new chord_routing_table(_nodeid, 2);
 	orphan_removal_counter = 0;
+	discovery_count = 0;
 	stabilize_counter = 0;
 	stabilize_finger = 0;
@@ -110,5 +111,8 @@
 	cmsg.encapsulate(&dmsg);
 	msg.encapsulate(&cmsg);
-	this->onMessage(&msg, NodeID::UNSPECIFIED, LinkID::UNSPECIFIED);
+	discovery_count++;
+	const route_item* item = (*table)[ discovery_count % table->size() ];
+	if (item!=NULL && !item->info.isUnspecified()) send(&msg,item->info);
+//	this->onMessage(&msg, NodeID::UNSPECIFIED, LinkID::UNSPECIFIED);
 }
 
Index: source/ariba/overlay/modules/chord/Chord.h
===================================================================
--- source/ariba/overlay/modules/chord/Chord.h	(revision 5642)
+++ source/ariba/overlay/modules/chord/Chord.h	(revision 5644)
@@ -78,4 +78,5 @@
 	vector<LinkID> bootstrapLinks;
 	vector<NodeID> pending;
+	int discovery_count;
 
 	// helper: sets up a link using the "base overlay"