Changeset 5743 for source/ariba/overlay/modules

Timestamp:

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

Author:

mies

Message:

 

Location:

source/ariba/overlay/modules

Files:

• chord/Chord.cpp (modified) (7 diffs)
• chord/Chord.h (modified) (1 diff)
• chord/messages/Discovery.h (modified) (3 diffs)
• onehop/OneHop.cpp (modified) (2 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

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

@@ -81 +81 @@
 
         // helper: sets up a link using the "base overlay"
-        LinkID setup( const EndpointDescriptor& endp, const NodeID& node = NodeID::UNSPECIFIED );
+        LinkID setup( const EndpointDescriptor& endp,
+                const NodeID& node = NodeID::UNSPECIFIED,
+                const NodeID& remoteRelay = NodeID::UNSPECIFIED );
 
         // helper: sends a message using the "base overlay"

source/ariba/overlay/modules/chord/messages/Discovery.h

@@ -70 +70 @@
                 this->follow_type = msg.follow_type;
                 this->ttl = msg.ttl;
+                this->source_relay = msg.source_relay;
                 this->source_endpoint = msg.source_endpoint;
         }
@@ -99 +100 @@
         }
 
+        inline void setSourceRelay( const NodeID& relay ) {
+                source_relay = relay;
+        }
+
+        inline const NodeID& getSourceRelay() const {
+                return source_relay;
+        }
 private:
         uint8_t follow_type;
         uint8_t ttl;
         EndpointDescriptor source_endpoint;
+        NodeID source_relay;
 };
 
@@ -112 +121 @@
 
         // serialize end-point
-        X && source_endpoint;
+        X && source_relay && source_endpoint;
 } sznEnd();
 

source/ariba/overlay/modules/onehop/OneHop.cpp

@@ -154 +154 @@
         } else {
                 bootstrapLinks.push_back(
-                                baseoverlay.establishLink( bootstrapEp,
+                                baseoverlay.establishDirectLink( bootstrapEp,
                                         OverlayInterface::OVERLAY_SERVICE_ID )
                                         );
@@ -314 +314 @@
 
                         logging_debug( "building up link to node in overlay " << node.toString() );
-                        const LinkID link = baseoverlay.establishLink( *((*i).second),
+                        const LinkID link = baseoverlay.establishDirectLink( *((*i).second),
                                                         OverlayInterface::OVERLAY_SERVICE_ID );