Changeset 10575

Timestamp:

Jun 18, 2012, 5:30:53 PM (12 years ago)

Author:

Michael Tänzer

Message:

When routing do not reset source NodeID

File:

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

source/ariba/overlay/BaseOverlay.cpp

@@ -2203 +2203 @@
                 DHTMessage dhtmsg(dhtMsg->getKey(), vect);
                 omsg.encapsulate(&dhtmsg);
-                dhtSend(&omsg, omsg.getDestinationNode());
+                send(&omsg, omsg.getDestinationNode());
                 break;
         }
@@ -2248 +2248 @@
         OverlayMsg msg( OverlayMsg::typeDHTPut );
         msg.encapsulate( &dhtmsg );
+        msg.setSourceNode(this->nodeId);
         dhtSend(&msg, dhtmsg.getHashedKey());
 }
@@ -2261 +2262 @@
         OverlayMsg msg(OverlayMsg::typeDHTRemove);
         msg.encapsulate( &dhtmsg );
+        msg.setSourceNode(this->nodeId);
         dhtSend(&msg, dhtmsg.getHashedKey());
 }
@@ -2274 +2276 @@
         OverlayMsg msg(OverlayMsg::typeDHTRemove);
         msg.encapsulate( &dhtmsg );
+        msg.setSourceNode(this->nodeId);
         dhtSend(&msg, dhtmsg.getHashedKey());
 }
@@ -2289 +2292 @@
         msg.setService(service);
         msg.encapsulate( &dhtmsg );
+        msg.setSourceNode(this->nodeId);
         dhtSend(&msg, dhtmsg.getHashedKey());
 }
@@ -2295 +2299 @@
         // log: dht send
         logging_info("DHT-Send: Sending message with key=" << dest.toString() );
-
-        /// set source and destination
-        msg->setSourceNode(this->nodeId);
 
         // local storage? yes-> put into DHT directly