[DHT] Add re-announce map to prevent duplicates within the hour

AmirAbrams · AmirAbrams · commit 1519aa5ae5a7 · 2019-07-07T17:16:27.000-05:00
diff --git a/src/dht/mutable.cpp b/src/dht/mutable.cpp
@@ -67,6 +67,6 @@ std::string CMutableData::Value() const
 
 std::string CMutableData::ToString() const
 {
-    return strprintf("CMutableData(InfoHash = %s\n, PublicKey = %s\n, Salt = %s\n, Signature = %s\n, Value = %s)\n",
-        InfoHash(), PublicKey(), Salt(), Signature(), Value());
+    return strprintf("CMutableData(\nInfoHash = %s\n, PublicKey = %s\n, Salt = %s\n, Seq = %d\n, Signature = %s\n, Value = %s)\n",
+        InfoHash(), PublicKey(), Salt(), SequenceNumber, Signature(), Value());
 }
diff --git a/src/dht/session.cpp b/src/dht/session.cpp
@@ -54,6 +54,8 @@ static SessionThreadGroup arraySessions;
 static std::shared_ptr<std::thread> pDHTTorrentThread;
 static std::shared_ptr<boost::thread> pReannounceThread = nullptr;
 static std::map<HashRecordKey, uint32_t> mPutCommands;
+//             <InfoHash   ,      pair<seq    , epoch>
+static std::map<std::string, std::pair<int64_t, int64_t>> mReannouceInfoHashes;
 static uint64_t nPutRecords = 0;
 static uint64_t nPutPieces = 0;
 static uint64_t nPutBytes = 0;
@@ -220,12 +222,30 @@ void ReannounceEntries()
     if (InitMemoryMap()) {
         try {
             while (fReannounceStarted) {
+                // cleanup mReannouceInfoHashes map, make sure it doesn't get too big.
                 MilliSleep(nReannouceSleepMilliSleep);
                 boost::this_thread::interruption_point();
                 CMutableData randomMutableItem;
                 // select one local item at random.  
                 if (SelectRandomMutableItem(randomMutableItem)) {
                     // Check if already re-annouced item
+                    int64_t nCurrentTime = GetTime();
+                    std::map<std::string, std::pair<int64_t, int64_t>>::iterator it = mReannouceInfoHashes.find(randomMutableItem.InfoHash());
+                    if (it == mReannouceInfoHashes.end()) {
+                        mReannouceInfoHashes[randomMutableItem.InfoHash()] = std::make_pair(randomMutableItem.SequenceNumber, nCurrentTime);
+                    } else {
+                        // check if we have a higher sequence number
+                        if (randomMutableItem.SequenceNumber > it->second.first) {
+                            mReannouceInfoHashes[randomMutableItem.InfoHash()] = std::make_pair(randomMutableItem.SequenceNumber, nCurrentTime);
+                        // check if we re-annouced over an hour ago
+                        } else if (nCurrentTime - it->second.second > (60 * 60)) {
+                            mReannouceInfoHashes[randomMutableItem.InfoHash()] = std::make_pair(randomMutableItem.SequenceNumber, nCurrentTime);
+                        } else {
+                            // already re-annouced entry within the hour with the same sequence number.  Do not re-annouce entry.
+                            continue;
+                        }
+                    }
+                    // TODO: Remove debug.log printing below.
                     // Check if fewer than 8 nodes returned the item with the most recent sequence number
                     LogPrintf("%s -- Re-annoucing item %s\n", __func__, randomMutableItem.ToString());
                     libtorrent::dht::item mut_item;

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,6 @@ std::string CMutableData::Value() const`
`67`	`67`
`68`	`68`	`std::string CMutableData::ToString() const`
`69`	`69`	`{`
`70`		`- return strprintf("CMutableData(InfoHash = %s\n, PublicKey = %s\n, Salt = %s\n, Signature = %s\n, Value = %s)\n",`
`71`		`- InfoHash(), PublicKey(), Salt(), Signature(), Value());`
	`70`	`+ return strprintf("CMutableData(\nInfoHash = %s\n, PublicKey = %s\n, Salt = %s\n, Seq = %d\n, Signature = %s\n, Value = %s)\n",`
	`71`	`+ InfoHash(), PublicKey(), Salt(), SequenceNumber, Signature(), Value());`
`72`	`72`	`}`