Changeset 10572 for source/ariba/overlay/BaseOverlay.cpp

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

File:

• source/ariba/overlay/BaseOverlay.cpp (modified) (12 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -1832 +1832 @@
 
         // handle dht messages (do not route)
-        if (overlayMsg->isDHTMessage())
-                return handleDHTMessage(overlayMsg);
+        if (overlayMsg->isDHTMessage()) {
+                bool ret = handleDHTMessage(overlayMsg);
+                delete overlayMsg;
+                return ret;
+        }
 
         // handle signaling messages (do not route!)
@@ -2161 +2164 @@
 
         // route message to closest node
-        if (!overlayInterface->isClosestNodeTo(msg->getDestinationNode())) {
+        if (!overlayInterface->isClosestNodeTo(dhtMsg->getHashedKey())) {
                 logging_debug("Routing DHT message to closest node "
                         << " from " << msg->getSourceNode()
-                        << " to " << msg->getDestinationNode()
+                        << " to " << dhtMsg->getHashedKey()
                 );
-                route( msg );
-                delete msg;
+                dhtSend(msg, dhtMsg->getHashedKey());
+                delete dhtMsg;
                 return true;
         }
@@ -2219 +2222 @@
                 return false;
         }
-        delete msg;
+        delete dhtMsg;
         return true;
 }
@@ -2239 +2242 @@
         }
 
-        // calculate hash
-        NodeID dest = NodeID::sha1(key.getBuffer(), key.getLength() / 8);
         DHTMessage dhtmsg( key, value );
         dhtmsg.setReplace( replace );
@@ -2247 +2248 @@
         OverlayMsg msg( OverlayMsg::typeDHTPut );
         msg.encapsulate( &dhtmsg );
-        dhtSend(&msg, dest);
+        dhtSend(&msg, dhtmsg.getHashedKey());
 }
 
@@ -2255 +2256 @@
         localDHT->remove(key,value);
 
-        // calculate hash
-        NodeID dest = NodeID::sha1(key.getBuffer(), key.getLength() / 8);
         DHTMessage dhtmsg(key,value);
 
@@ -2262 +2261 @@
         OverlayMsg msg(OverlayMsg::typeDHTRemove);
         msg.encapsulate( &dhtmsg );
-        dhtSend(&msg, dest);
+        dhtSend(&msg, dhtmsg.getHashedKey());
 }
 
@@ -2270 +2269 @@
         logging_info("DHT-Remove: Removing key=" << key );
 
-        // calculate hash
-        NodeID dest = NodeID::sha1(key.getBuffer(), key.getLength() / 8);
         DHTMessage dhtmsg(key);
 
@@ -2277 +2274 @@
         OverlayMsg msg(OverlayMsg::typeDHTRemove);
         msg.encapsulate( &dhtmsg );
-        dhtSend(&msg, dest);
+        dhtSend(&msg, dhtmsg.getHashedKey());
 }
 
@@ -2286 +2283 @@
                         key << " for service=" << service.toString() );
 
-        // calculate hash
-        NodeID dest = NodeID::sha1(key.getBuffer(), key.getLength() / 8);
         DHTMessage dhtmsg(key);
 
@@ -2294 +2289 @@
         msg.setService(service);
         msg.encapsulate( &dhtmsg );
-        dhtSend(&msg, dest);
+        dhtSend(&msg, dhtmsg.getHashedKey());
 }
 
@@ -2303 +2298 @@
         /// set source and destination
         msg->setSourceNode(this->nodeId);
-        msg->setDestinationNode(dest);
 
         // local storage? yes-> put into DHT directly
-        if (overlayInterface->isClosestNodeTo(msg->getDestinationNode())) {
+        if (overlayInterface->isClosestNodeTo(dest)) {
+                // be compatible with old code so set destination to hashed key
+                msg->setDestinationNode(dest);
+                
                 Data d = data_serialize(msg);
-                Message* m2 = new Message(d);
-                OverlayMsg* m3 = m2->decapsulate<OverlayMsg>();
+                Message m2(d);
+                OverlayMsg* m3 = m2.decapsulate<OverlayMsg>();
+                
                 handleDHTMessage(m3);
-                delete m2;
+                
+                delete m3;
                 return;
-        }
-
-        // send message "normally"
-        send( msg, dest );
+        } else {
+                // need to route
+                NodeID next_hop = overlayInterface->getNextNodeId(dest);
+                msg->setDestinationNode(next_hop);
+                
+                send(msg, next_hop);
+                
+                return;
+        }
 }