Changeset 5743 for source/ariba/overlay/modules/chord/Chord.cpp

Timestamp:

Aug 6, 2009, 2:32:48 PM (16 years ago)

Author:

mies

Message:

 

File:

• source/ariba/overlay/modules/chord/Chord.cpp (modified) (7 diffs)

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

@@ -57 +57 @@
 
         // create routing table
-        this->table = new chord_routing_table(_nodeid, 2);
+        this->table = new chord_routing_table(_nodeid, 4);
         orphan_removal_counter = 0;
         discovery_count = 0;
@@ -71 +71 @@
 
 /// helper: sets up a link using the base overlay
-LinkID Chord::setup(const EndpointDescriptor& endp, const NodeID& node) {
+LinkID Chord::setup(const EndpointDescriptor& endp, const NodeID& node, const NodeID& remoteRelay ) {
         logging_debug("Request to setup link to " << endp.toString() );
 
+        // check if we already have a connection
         for (int i=0; i<table->size(); i++)
                 if ((*table)[i]->id == node && !((*table)[i]->info.isUnspecified()))
@@ -89 +90 @@
 
         // establish link via base overlay
-        return baseoverlay.establishLink(endp, node, OverlayInterface::OVERLAY_SERVICE_ID);
+        return baseoverlay.establishLink(endp, node, OverlayInterface::OVERLAY_SERVICE_ID, remoteRelay );
 }
 
@@ -105 +106 @@
         Discovery dmsg;
         dmsg.setSourceEndpoint(&baseoverlay.getEndpointDescriptor());
+        dmsg.setSourceRelay(baseoverlay.getRelayNode(destination));
         dmsg.setFollowType(Discovery::normal);
         dmsg.setTTL((uint8_t) ttl);
@@ -120 +122 @@
                 Discovery dmsg;
                 dmsg.setSourceEndpoint(&baseoverlay.getEndpointDescriptor());
+                dmsg.setSourceRelay(baseoverlay.getRelayNode(nodeid));
                 dmsg.setFollowType(Discovery::successor);
                 dmsg.setTTL((uint8_t)3);
@@ -130 +133 @@
                 Discovery dmsg;
                 dmsg.setSourceEndpoint(&baseoverlay.getEndpointDescriptor());
+                dmsg.setSourceRelay(baseoverlay.getRelayNode(nodeid));
                 dmsg.setFollowType(Discovery::predecessor);
                 dmsg.setTTL((uint8_t)3);
@@ -332 +336 @@
                 // check if source node can be added to routing table and setup link
                 if (m->getSource() != nodeid && table->is_insertable(m->getSource()))
-                        setup(*dmsg->getSourceEndpoint(), m->getSource() );
+                        setup(*dmsg->getSourceEndpoint(), m->getSource(), dmsg->getSourceRelay() );
 
                 // delegate discovery message