Changeset 5750 for source/ariba/overlay

Timestamp:

Aug 6, 2009, 3:20:32 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (2 diffs)
• modules/chord/Chord.cpp (modified) (5 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -277 +277 @@
 
         // create relay link descriptor
-        LinkDescriptor* rld = getRelayDescriptor(remoteNode);
-        NodeID relayNode = rld != NULL ? rld->remoteNode : NodeID::UNSPECIFIED;
+        NodeID relayNode = getRelayNode(remoteNode);
 
         // add descriptor
@@ -330 +329 @@
 
         // timer for auto link management
-        Timer::setInterval( 500 );
+        Timer::setInterval( 1000 );
         Timer::start();
 

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

@@ -57 +57 @@
 
         // create routing table
-        this->table = new chord_routing_table(_nodeid, 4);
+        this->table = new chord_routing_table(_nodeid, 2);
         orphan_removal_counter = 0;
         discovery_count = 0;
@@ -124 +124 @@
                 dmsg.setSourceRelay(baseoverlay.getRelayNode(nodeid));
                 dmsg.setFollowType(Discovery::successor);
-                dmsg.setTTL((uint8_t)3);
+                dmsg.setTTL((uint8_t)2);
                 cmsg.encapsulate(&dmsg);
                 send(&cmsg, lnk);
@@ -135 +135 @@
                 dmsg.setSourceRelay(baseoverlay.getRelayNode(nodeid));
                 dmsg.setFollowType(Discovery::predecessor);
-                dmsg.setTTL((uint8_t)3);
+                dmsg.setTTL((uint8_t)2);
                 cmsg.encapsulate(&dmsg);
                 send(&cmsg, lnk);
@@ -220 +220 @@
                 // all nodes that I know, fingers, succ/pred
                 for (size_t i = 0; i < table->size(); i++){
-                        if (/*(*table)[i]->ref_count != 0
-                                        &&*/ !(*table)[i]->info.isUnspecified())
+                        if ((*table)[i]->ref_count != 0
+                                        && !(*table)[i]->info.isUnspecified())
                                 nodelist.push_back((*table)[i]->id);
                 }
@@ -267 +267 @@
 
         discover_neighbors( lnk );
-        send_discovery_to(remote);
 
         vector<LinkID>::iterator it = std::find(bootstrapLinks.begin(), bootstrapLinks.end(), lnk);