Drop old node from DHT routing table if node ID has changed.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/DHTMessageTracker.cc b/src/DHTMessageTracker.cc
index 7709165e..d93c8213 100644
--- a/src/DHTMessageTracker.cc
+++ b/src/DHTMessageTracker.cc
@@ -90,6 +90,16 @@ DHTMessageTracker::messageArrived
         A2_LOG_DEBUG(fmt("RTT is %s", util::itos(rtt).c_str()));
         message->getRemoteNode()->updateRTT(rtt);
         SharedHandle<DHTMessageCallback> callback = entry->getCallback();
+        if(!(*targetNode == *message->getRemoteNode())) {
+          // Node ID has changed. Drop previous node ID from
+          // DHTRoutingTable
+          A2_LOG_DEBUG
+            (fmt("Node ID has changed: old:%s, new:%s",
+                 util::toHex(targetNode->getID(), DHT_ID_LENGTH).c_str(),
+                 util::toHex(message->getRemoteNode()->getID(),
+                             DHT_ID_LENGTH).c_str()));
+          routingTable_->dropNode(targetNode);
+        }
         return std::make_pair(message, callback);
       } catch(RecoverableException& e) {
         handleTimeoutEntry(entry);