[DHT] Add get events RPC command

AmirAbrams · AmirAbrams · commit 5261f8480dc7 · 2019-07-12T23:15:58.000-05:00
diff --git a/src/dht/rpcdht.cpp b/src/dht/rpcdht.cpp
@@ -1162,6 +1162,42 @@ static UniValue ReannounceLocalMutable(const JSONRPCRequest& request)
     return result;
 }
 
+static UniValue GetHashTableEvents(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 1)
+        throw std::runtime_error(
+            "dht events\n"
+            "\nReturns DHT events.\n"
+            "\nResult:\n"
+            "{(json object)\n"
+            "  \"link_requestor\"      (string)      BDAP account that initiated the link\n"
+            "}\n"
+            "\nExamples\n" +
+           HelpExampleCli("dht reannounce", "\"88196b9f8ca5f1dfb095bd48e18d97157f7a4435\"") +
+           "\nAs a JSON-RPC call\n" + 
+           HelpExampleRpc("dht reannounce", "\"88196b9f8ca5f1dfb095bd48e18d97157f7a4435\""));
+
+    if (!DHT::SessionStatus())
+        throw JSONRPCError(RPC_DHT_NOT_STARTED, strprintf("dht %s failed. DHT session not started.", request.params[0].get_str()));
+
+    UniValue results(UniValue::VOBJ);
+    std::vector<CEvent> events;
+    DHT::GetEvents(0, events);
+    size_t nCount = 0;
+    for (const CEvent& event : events) {
+        nCount++;
+        UniValue oEventItem(UniValue::VOBJ);
+        oEventItem.push_back(Pair("message", event.Message()));
+        oEventItem.push_back(Pair("type", (int)event.Type()));
+        oEventItem.push_back(Pair("category", (int)event.Category()));
+        oEventItem.push_back(Pair("what", event.What()));
+        oEventItem.push_back(Pair("timestamp", (int)event.Timestamp()));
+        results.push_back(Pair("event_" + std::to_string(nCount), oEventItem));
+    }
+
+    return results;
+}
+
 UniValue dht_rpc(const JSONRPCRequest& request) 
 {
     std::string strCommand;
@@ -1229,6 +1265,9 @@ UniValue dht_rpc(const JSONRPCRequest& request)
     else if (strCommand == "reannounce") {
         return ReannounceLocalMutable(request);
     }
+    else if (strCommand == "events") {
+        return GetHashTableEvents(request);
+    }
     else {
         throw JSONRPCError(RPC_METHOD_NOT_FOUND, strprintf("%s is an unknown DHT method command.", strCommand));
     }
diff --git a/src/dht/session.cpp b/src/dht/session.cpp
@@ -217,7 +217,6 @@ void StartEventListener(std::shared_ptr<CHashTableSession> dhtSession)
             } else {
                 const CEvent event(strAlertMessage, iAlertType, iAlertCategory, strAlertTypeName);
                 dhtSession->AddToEventMap(iAlertType, event);
-                LogPrintf("%s -- \nEvent\n%s\n", __func__, event.ToString());
             }
         }
         if (dhtSession->fShutdown)
@@ -843,6 +842,19 @@ bool CHashTableSession::GetLastTypeEvent(const int& type, const int64_t& startTi
     return events.size() > 0;
 }
 
+void CHashTableSession::GetEvents(const int64_t& startTime, std::vector<CEvent>& events)
+{
+    LOCK(cs_EventMap);
+    std::multimap<int, EventPair>::iterator iEvents = m_EventTypeMap.begin();
+    while (iEvents != m_EventTypeMap.end()) {
+        if (iEvents->second.first >= startTime) {
+            events.push_back(iEvents->second.second);
+        }
+        iEvents++;
+    }
+    LogPrintf("%s -- events.size() = %u\n", __func__, events.size());
+}
+
 bool CHashTableSession::FindDHTGetEvent(const std::string& infoHash, CMutableGetEvent& event)
 {
     //LOCK(cs_DHTGetEventMap);
@@ -1059,4 +1071,12 @@ bool ReannounceEntry(const CMutableData& mutableData)
     return arraySessions[0].second->ReannounceEntry(mutableData);
 }
 
+void GetEvents(const int64_t& startTime, std::vector<CEvent>& events)
+{
+    size_t nRunningThreads = fMultiThreads ? nThreads : 1;
+    for (unsigned int i = 0; i < nRunningThreads; i++) {
+        arraySessions[i].second->GetEvents(startTime, events);
+    }
+}
+
 } // end DHT namespace
diff --git a/src/dht/session.h b/src/dht/session.h
@@ -88,6 +88,7 @@ class CHashTableSession {
     void CleanUpEventMap(const uint32_t timeout);
     void StopEventListener();
     bool ReannounceEntry(const CMutableData& mutableData);
+    void GetEvents(const int64_t& startTime, std::vector<CEvent>& events);
 
 private:
     bool GetDataFromMap(const std::array<char, 32>& public_key, const std::string& recordSalt, CMutableGetEvent& event);
@@ -125,6 +126,8 @@ namespace DHT
     bool GetAllDHTGetEvents(const size_t nSessionThread, std::vector<CMutableGetEvent>& vchGetEvents);
     void GetDHTStats(CSessionStats& stats);
     bool ReannounceEntry(const CMutableData& mutableData);
+    void GetEvents(const int64_t& startTime, std::vector<CEvent>& events);
+
 }
 
 #endif // DYNAMIC_DHT_SESSION_H
