From 1231d4e6c40d1be00e05fbfaa59f65338dddf368 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Mon, 24 Oct 2022 20:39:05 -0400
Subject: [PATCH] add 'networkReady' to endpoint status

---
 llarp/service/endpoint.cpp | 34 +++++++++++++++++++++++++++-------
 llarp/service/endpoint.hpp |  3 +++
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index 03455d118..48c33543a 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -40,6 +40,11 @@
 #include <uvw.hpp>
 #include <variant>
 
+namespace
+{
+  constexpr size_t MIN_ENDPOINTS_FOR_LNS_LOOKUP = 2;
+}  // namespace
+
 namespace llarp
 {
   namespace service
@@ -309,6 +314,7 @@ namespace llarp
       auto obj = path::Builder::ExtractStatus();
       obj["exitMap"] = m_ExitMap.ExtractStatus();
       obj["identity"] = m_Identity.pub.Addr().ToString();
+      obj["networkReady"] = ReadyToDoLookup();
 
       util::StatusObject authCodes;
       for (const auto& [service, info] : m_RemoteAuthInfos)
@@ -946,6 +952,22 @@ namespace llarp
       return not m_ExitMap.Empty();
     }
 
+    bool
+    Endpoint::ReadyToDoLookup(std::optional<uint64_t> numPaths) const
+    {
+      if (not numPaths)
+      {
+        path::Path::UniqueEndpointSet_t paths;
+        ForEachPath([&paths](auto path) {
+          if (path and path->IsReady())
+            paths.insert(path);
+        });
+        numPaths = paths.size();
+      }
+
+      return numPaths >= MIN_ENDPOINTS_FOR_LNS_LOOKUP;
+    }
+
     void
     Endpoint::LookupNameAsync(
         std::string name,
@@ -965,23 +987,20 @@ namespace llarp
       }
       LogInfo(Name(), " looking up LNS name: ", name);
       path::Path::UniqueEndpointSet_t paths;
-      ForEachPath([&](auto path) {
+      ForEachPath([&paths](auto path) {
         if (path and path->IsReady())
           paths.insert(path);
       });
 
-      constexpr size_t min_unique_lns_endpoints = 2;
-      constexpr size_t max_unique_lns_endpoints = 7;
-
       // not enough paths
-      if (paths.size() < min_unique_lns_endpoints)
+      if (not ReadyToDoLookup(paths.size()))
       {
         LogWarn(
             Name(),
             " not enough paths for lns lookup, have ",
             paths.size(),
             " need ",
-            min_unique_lns_endpoints);
+            MIN_ENDPOINTS_FOR_LNS_LOOKUP);
         handler(std::nullopt);
         return;
       }
@@ -1006,11 +1025,12 @@ namespace llarp
         handler(result);
       };
 
+      constexpr size_t max_lns_lookup_endpoints = 7;
       // pick up to max_unique_lns_endpoints random paths to do lookups from
       std::vector<path::Path_ptr> chosenpaths;
       chosenpaths.insert(chosenpaths.begin(), paths.begin(), paths.end());
       std::shuffle(chosenpaths.begin(), chosenpaths.end(), CSRNG{});
-      chosenpaths.resize(std::min(paths.size(), max_unique_lns_endpoints));
+      chosenpaths.resize(std::min(paths.size(), max_lns_lookup_endpoints));
 
       auto resultHandler =
           m_state->lnsTracker.MakeResultHandler(name, chosenpaths.size(), maybeInvalidateCache);
diff --git a/llarp/service/endpoint.hpp b/llarp/service/endpoint.hpp
index 00a2a3c68..09b960957 100644
--- a/llarp/service/endpoint.hpp
+++ b/llarp/service/endpoint.hpp
@@ -521,6 +521,9 @@ namespace llarp
         return false;
       }
 
+      bool
+      ReadyToDoLookup(std::optional<uint64_t> numPaths = std::nullopt) const;
+
      protected:
       IDataHandler* m_DataHandler = nullptr;
       Identity m_Identity;