Changeset 5646 for source/ariba/overlay/modules

Timestamp:

Aug 4, 2009, 11:33:24 AM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba/overlay/modules/chord

Files:

• Chord.cpp (modified) (2 diffs)
• Chord.h (modified) (1 diff)

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

@@ -102 +102 @@
 /// sends a discovery message
 void Chord::send_discovery_to(const NodeID& destination, int ttl) {
-//      logging_debug("Initiating discovery of " << destination.toString() );
-        Message msg;
+        if ( table->size() == 0 ) return;
+
         ChordMessage cmsg(ChordMessage::discovery, nodeid, destination);
         Discovery dmsg;
@@ -110 +110 @@
         dmsg.setTTL((uint8_t) ttl);
         cmsg.encapsulate(&dmsg);
-        msg.encapsulate(&cmsg);
         discovery_count++;
+        if (discovery_count<0) discovery_count = 0;
         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);
+        if (item!=NULL && !item->info.isUnspecified()) send(&cmsg,item->info);
 }
 

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

@@ -87 +87 @@
 
         // stabilization: sends a discovery message to the specified neighborhood
-        void send_discovery_to( const NodeID& destination, int ttl = 4 );
+        void send_discovery_to( const NodeID& destination, int ttl = 3 );
 
 public: