Changeset 10572 for source/ariba/overlay/modules

Timestamp:

Jun 18, 2012, 1:40:59 PM (13 years ago)

Author:

Michael Tänzer

Message:

Fix DHT: messages got lost if not communicating over a direct link.

Also:

• Fix mem leak
• Code clean up

Location:

source/ariba/overlay/modules

Files:

• OverlayInterface.h (modified) (1 diff)
• chord/Chord.cpp (modified) (1 diff)
• chord/Chord.h (modified) (1 diff)
• onehop/OneHop.cpp (modified) (1 diff)
• onehop/OneHop.h (modified) (1 diff)

source/ariba/overlay/modules/OverlayInterface.h

@@ -145 +145 @@
          */
         virtual const LinkID& getNextLinkId( const NodeID& id ) const = 0;
+        
+        /**
+         * Returns the NodeID of the next hop a route message would take.
+         * 
+         * @param id The destination node id
+         * @return The node id of the next hop
+         */
+        virtual const NodeID& getNextNodeId( const NodeID& id ) const;
 
         //--- functions from CommunicationListener that we _can_ use as overlay ---

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

@@ -201 +201 @@
 }
 
+/// @see OverlayInterface.h
+const NodeID& Chord::getNextNodeId( const NodeID& id ) const {
+        // get next hop
+        const route_item* item = table->get_next_hop(id);
+        
+        // return unspecified if no next hop could be found
+        if (item == NULL) {
+                return NodeID::UNSPECIFIED;
+        }
+        
+        return item->id;
+}
+
 OverlayInterface::NodeList Chord::getKnownNodes(bool deep) const {
         OverlayInterface::NodeList nodelist;

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

@@ -104 +104 @@
         /// @see OverlayInterface.h
         virtual const LinkID& getNextLinkId( const NodeID& id ) const;
+        
+        /// @see OverlayInterface.h
+        virtual const NodeID& getNextNodeId( const NodeID& id ) const;
 
         /// @see OverlayInterface.h

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

@@ -122 +122 @@
 }
 
+/// @see OverlayInterface.h
+const NodeID& OneHop::getNextNodeId( const NodeID& id ) const {
+        OverlayNodeMapping::const_iterator i = overlayNodes.find( id );
+        
+        // FIXME: in case the NodeID is not known we should return the nearest node
+        if (i == overlayNodes.end()) {
+                return NodeID::UNSPECIFIED;
+        }
+        
+        return i->first;
+}
+
 void OneHop::createOverlay() {
         // don't need to bootstrap against ourselfs.

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

@@ -85 +85 @@
         /// @see OverlayInterface.h
         virtual const LinkID& getNextLinkId( const NodeID& id ) const;
+        
+        /// @see OverlayInterface.h
+        virtual const NodeID& getNextNodeId( const NodeID& id ) const;
 
         /// @see OverlayInterface.h