Merge pull request #1041 from notlesh/dht-fixes-cleanup

Dht fixes cleanup

llarp/dht/localrouterlookup.cpp

@@ -48,6 +48,10 @@ namespace llarp
           valuesFound.resize(1);
           valuesFound[0] = found;
         }
+        else
+        {
+          llarp::LogWarn("We found a null RC for dht request, dropping it");
+        }
       }
       routing::DHTMessage msg;
       msg.M.emplace_back(new GotRouterMessage(parent->OurKey(), whoasked.txid,

llarp/router/rc_lookup_handler.cpp

@@ -14,6 +14,7 @@
 
 #include <iterator>
 #include <functional>
+#include <random>
 
 namespace llarp
 {
@@ -48,6 +49,13 @@ namespace llarp
             " routers");
   }
 
+  bool
+  RCLookupHandler::HaveReceivedWhitelist()
+  {
+    util::Lock l(&_mutex);
+    return whitelistRouters.empty();
+  }
+
   void
   RCLookupHandler::GetRC(const RouterID &router, RCRequestCallback callback,
                          bool forceLookup)
@@ -239,21 +247,30 @@ namespace llarp
     }
 
     if(useWhitelist)
-    {
-      std::set< RouterID > lookupRouters;
     {
       static constexpr size_t LookupPerTick = 25;
+
+      std::vector< RouterID > lookupRouters;
+      lookupRouters.reserve(LookupPerTick);
+
+      {
         // if we are using a whitelist look up a few routers we don't have
         util::Lock l(&_mutex);
         for(const auto &r : whitelistRouters)
         {
           if(_nodedb->Has(r))
             continue;
-          lookupRouters.emplace(r);
+          lookupRouters.emplace_back(r);
-          if(lookupRouters.size() >= LookupPerTick)
+        }
-            break;
       }
+
+      if(lookupRouters.size() > LookupPerTick)
+      {
+        static std::mt19937_64 rng{std::random_device{}()};
+        std::shuffle(lookupRouters.begin(), lookupRouters.end(), rng);
+        lookupRouters.resize(LookupPerTick);
       }
+
       for(const auto &r : lookupRouters)
         GetRC(r, nullptr, true);
       return;

llarp/router/rc_lookup_handler.hpp

@@ -40,6 +40,9 @@ namespace llarp
     SetRouterWhitelist(const std::vector< RouterID > &routers) override
         LOCKS_EXCLUDED(_mutex);
 
+    bool
+    HaveReceivedWhitelist();
+
     void
     GetRC(const RouterID &router, RCRequestCallback callback,
           bool forceLookup = false) override LOCKS_EXCLUDED(_mutex);

llarp/router/router.cpp

@@ -679,7 +679,7 @@ namespace llarp
         LogError("Failed to update our RC");
     }
 
-    if(isSvcNode)
+    if(isSvcNode && _rcLookupHandler.HaveReceivedWhitelist())
     {
       // remove RCs for nodes that are no longer allowed by network policy
       nodedb()->RemoveIf([&](const RouterContact &rc) -> bool {