Changeset 5721

Timestamp:

Aug 5, 2009, 5:10:39 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

@@ -121 +121 @@
                 dmsg.setSourceEndpoint(&baseoverlay.getEndpointDescriptor());
                 dmsg.setFollowType(Discovery::successor);
-                dmsg.setTTL((uint8_t)5);
+                dmsg.setTTL((uint8_t)2);
                 cmsg.encapsulate(&dmsg);
                 send(&cmsg, lnk);
@@ -131 +131 @@
                 dmsg.setSourceEndpoint(&baseoverlay.getEndpointDescriptor());
                 dmsg.setFollowType(Discovery::predecessor);
-                dmsg.setTTL((uint8_t)5);
+                dmsg.setTTL((uint8_t)2);
                 cmsg.encapsulate(&dmsg);
                 send(&cmsg, lnk);
@@ -340 +340 @@
                 case Discovery::normal: {
                         // closest node? yes-> split to follow successor and predecessor
-                        if (table->is_closest_to(m->getDestination())) {
+                        if (table->is_closest_to(m->getDestination())
+                                || (table->get_successor()!=NULL && *table->get_successor() == m->getDestination())
+                                || (table->get_predesessor()!=NULL && *table->get_predesessor() == m->getDestination())
+                        ) {
 
                                 if (table->get_successor() != NULL) {
@@ -370 +373 @@
                         else {
                                 // find next hop
-                                const route_item* item = table->get_next_hop(m->getDestination());
+                                const route_item* item = table->get_next_hop(m->getDestination(),true);
                                 if (item == NULL || item->id == nodeid) break;
                                 logging_debug("routing discovery message to " <<
                                                 item->id.toString() );
-                                ChordMessage cmsg_p(*m);
-                                Discovery dmsg_p(*dmsg);
-                                cmsg_p.encapsulate(&dmsg_p);
-                                send(&cmsg_p, item->info);
+                                send(m, item->info);
                         }
                         break;