oxen-io · tewinget · Oct 27, 2022 · Oct 27, 2022 · Oct 27, 2022 · Oct 27, 2022
diff --git a/daemon/lokinet.cpp b/daemon/lokinet.cpp
@@ -598,8 +598,7 @@ SvcCtrlHandler(DWORD dwCtrl)
 
     case SERVICE_CONTROL_INTERROGATE:
       llarp::log::debug(logcat, "Got win32 service interrogate signal");
-      // report status
-      llarp::sys::service_manager->report_our_state();
+      llarp::sys::service_manager->report_changed_state();
       return;
 
     default:

diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
@@ -49,11 +49,16 @@ target_link_libraries(lokinet-platform PUBLIC lokinet-cryptography lokinet-util
 target_link_libraries(lokinet-platform PRIVATE oxenmq::oxenmq)
 
 if (ANDROID)
-  target_sources(lokinet-platform PRIVATE android/ifaddrs.c android/service_manager.cpp)
+  target_sources(lokinet-platform PRIVATE android/ifaddrs.c util/nop_service_manager.cpp)
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  target_sources(lokinet-platform PRIVATE linux/dbus.cpp linux/service_manager.cpp)
+  target_sources(lokinet-platform PRIVATE linux/dbus.cpp)
+  if(WITH_SYSTEMD)
+    target_sources(lokinet-platform PRIVATE linux/sd_service_manager.cpp)
+  else()
+    target_sources(lokinet-platform PRIVATE util/nop_service_manager.cpp)
+  endif()
 endif()
 
 if (WIN32)
@@ -313,6 +318,7 @@ endif()
 
 if(APPLE)
   add_subdirectory(apple)
+  target_sources(lokinet-platform PRIVATE util/nop_system_manager.cpp)
 endif()
 
 file(GLOB_RECURSE docs_SRC */*.hpp *.hpp)

diff --git a/llarp/android/service_manager.cpp b/llarp/android/service_manager.cpp
diff --git a/llarp/apple/CMakeLists.txt b/llarp/apple/CMakeLists.txt
@@ -13,7 +13,7 @@ find_library(COREFOUNDATION CoreFoundation REQUIRED)
 
 target_link_libraries(lokinet-util PUBLIC ${FOUNDATION})
 
-target_sources(lokinet-platform PRIVATE vpn_platform.cpp vpn_interface.cpp route_manager.cpp context_wrapper.cpp service_manager.cpp)
+target_sources(lokinet-platform PRIVATE vpn_platform.cpp vpn_interface.cpp route_manager.cpp context_wrapper.cpp)
 
 add_executable(lokinet-extension MACOSX_BUNDLE
   PacketTunnelProvider.m

diff --git a/llarp/linux/sd_service_manager.cpp b/llarp/linux/sd_service_manager.cpp
@@ -0,0 +1,60 @@
+#include <llarp/util/service_manager.hpp>
+
+#include <systemd/sd-daemon.h>
+#include <cassert>
+#include <llarp.hpp>
+#include <llarp/router/router.hpp>
+#include <llarp/util/logging.hpp>
+
+namespace llarp::sys
+{
+  class SD_Manager : public I_SystemLayerManager
+  {
+    llarp::sys::ServiceState m_State{ServiceState::Initial};
+
+   public:
+    /// change our state and report it to the system layer
+    void
+    we_changed_our_state(ServiceState st) override
+    {
+      assert(m_State != st);
+      m_State = st;
+      report_changed_state();
+    }
+
+    void
+    report_changed_state() override
+    {
+      if (m_State == ServiceState::Running)
+      {
+        ::sd_notify(0, "READY=1");
+        return;
+      }
+      if (m_State == ServiceState::Stopping)
+      {
+        ::sd_notify(0, "STOPPING=1");
+        return;
+      }
+    }
+
+    void
+    report_periodic_stats() override
+    {
+      if (m_Context and m_Context->router and not m_disable)
+      {
+        auto status = m_Context->router->status_line();
+        ::sd_notify(0, status.c_str());
+      }
+    }
+
+    void
+    system_changed_our_state(ServiceState) override
+    {
+      // not applicable on systemd
+    }
+  };
+
+  SD_Manager _manager{};
+  I_SystemLayerManager* const service_manager = &_manager;
+
+}  // namespace llarp::sys
diff --git a/llarp/linux/service_manager.cpp b/llarp/linux/service_manager.cpp
@@ -1,13 +1,10 @@
 #include <llarp/util/service_manager.hpp>
 
-#if defined(WITH_SYSTEMD)
 #include <systemd/sd-daemon.h>
 #include <cassert>
-#endif
 
 namespace llarp::sys
 {
-#if defined(WITH_SYSTEMD)
   class SD_Manager : public I_SystemLayerManager
   {
     llarp::sys::ServiceState m_State{ServiceState::Initial};
@@ -26,12 +23,6 @@ namespace llarp::sys
     void
     report_our_state() override
     {
-      if (m_State == ServiceState::Starting)
-      {
-        // TODO: maybe request more time?
-        ::sd_notify(0, "READY=0");
-        return;
-      }
       if (m_State == ServiceState::Running)
       {
         ::sd_notify(0, "READY=1");
@@ -51,11 +42,10 @@ namespace llarp::sys
     }
   };
 
-  SD_Manager _manager{};
-#else
-  NOP_SystemLayerHandler _manager{};
-#endif
-
+  SD_Manager _manager
+  {
+    ;
+  }
   I_SystemLayerManager* const service_manager = &_manager;
 
 }  // namespace llarp::sys
diff --git a/llarp/router/abstractrouter.hpp b/llarp/router/abstractrouter.hpp
@@ -361,6 +361,9 @@ namespace llarp
     virtual void
     GossipRCIfNeeded(const RouterContact rc) = 0;
 
+    virtual std::string
+    status_line() = 0;
+
     /// Templated convenience function to generate a RouterHive event and
     /// delegate to non-templated (and overridable) function for handling.
     template <class EventType, class... Params>

diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp
@@ -874,6 +874,60 @@ namespace llarp
     m_LastStatsReport = now;
   }
 
+  std::string
+  Router::status_line()
+  {
+    std::string status;
+#if defined(WITH_SYSTEMD)
+    auto out = std::back_inserter(status);
+    fmt::format_to(out, "WATCHDOG=1\nSTATUS=v{}", llarp::VERSION_STR);
+    if (IsServiceNode())
+    {
+      fmt::format_to(
+          out,
+          " snode | known/svc/clients: {}/{}/{}",
+          nodedb()->NumLoaded(),
+          NumberOfConnectedRouters(),
+          NumberOfConnectedClients());
+      fmt::format_to(
+          out,
+          " | {} active paths | block {} ",
+          pathContext().CurrentTransitPaths(),
+          (m_lokidRpcClient ? m_lokidRpcClient->BlockHeight() : 0));
+      auto maybe_last = _rcGossiper.LastGossipAt();
+      fmt::format_to(
+          out,
+          " | gossip: (next/last) {} / {}",
+          short_time_from_now(_rcGossiper.NextGossipAt()),
+          maybe_last ? short_time_from_now(*maybe_last) : "never");
+    }
+    else
+    {
+      fmt::format_to(
+          out,
+          " client | known/connected: {}/{}",
+          nodedb()->NumLoaded(),
+          NumberOfConnectedRouters());
+
+      if (auto ep = hiddenServiceContext().GetDefault())
+      {
+        fmt::format_to(
+            out,
+            " | paths/endpoints {}/{}",
+            pathContext().CurrentOwnedPaths(),
+            ep->UniqueEndpoints());
+
+        if (auto success_rate = ep->CurrentBuildStats().SuccessRatio(); success_rate < 0.5)
+        {
+          fmt::format_to(
+              out, " [ !!! Low Build Success Rate ({:.1f}%) !!! ]", (100.0 * success_rate));
+        }
+      };
+    }
+#endif
+    return status;
+  }
+
   void
   Router::Tick()
   {
@@ -888,57 +942,7 @@ namespace llarp
       Thaw();
     }
 
-#if defined(WITH_SYSTEMD)
-    {
-      std::string status;
-      auto out = std::back_inserter(status);
-      fmt::format_to(out, "WATCHDOG=1\nSTATUS=v{}", llarp::VERSION_STR);
-      if (IsServiceNode())
-      {
-        fmt::format_to(
-            out,
-            " snode | known/svc/clients: {}/{}/{}",
-            nodedb()->NumLoaded(),
-            NumberOfConnectedRouters(),
-            NumberOfConnectedClients());
-        fmt::format_to(
-            out,
-            " | {} active paths | block {} ",
-            pathContext().CurrentTransitPaths(),
-            (m_lokidRpcClient ? m_lokidRpcClient->BlockHeight() : 0));
-        auto maybe_last = _rcGossiper.LastGossipAt();
-        fmt::format_to(
-            out,
-            " | gossip: (next/last) {} / {}",
-            short_time_from_now(_rcGossiper.NextGossipAt()),
-            maybe_last ? short_time_from_now(*maybe_last) : "never");
-      }
-      else
-      {
-        fmt::format_to(
-            out,
-            " client | known/connected: {}/{}",
-            nodedb()->NumLoaded(),
-            NumberOfConnectedRouters());
-
-        if (auto ep = hiddenServiceContext().GetDefault())
-        {
-          fmt::format_to(
-              out,
-              " | paths/endpoints {}/{}",
-              pathContext().CurrentOwnedPaths(),
-              ep->UniqueEndpoints());
-
-          if (auto success_rate = ep->CurrentBuildStats().SuccessRatio(); success_rate < 0.5)
-          {
-            fmt::format_to(
-                out, " [ !!! Low Build Success Rate ({:.1f}%) !!! ]", (100.0 * success_rate));
-          }
-        };
-      }
-      ::sd_notify(0, status.c_str());
-    }
-#endif
+    llarp::sys::service_manager->report_periodic_stats();
 
     m_PathBuildLimiter.Decay(now);
 

diff --git a/llarp/router/router.hpp b/llarp/router/router.hpp
@@ -316,6 +316,9 @@ namespace llarp
     RCLookupHandler _rcLookupHandler;
     RCGossiper _rcGossiper;
 
+    std::string
+    status_line() override;
+
     using Clock_t = std::chrono::steady_clock;
     using TimePoint_t = Clock_t::time_point;
 

diff --git a/llarp/apple/service_manager.cpp → llarp/util/nop_service_manager.cpp b/llarp/apple/service_manager.cpp → llarp/util/nop_service_manager.cpp
@@ -1,4 +1,4 @@
-#include <llarp/util/service_manager.hpp>
+#include "service_manager.hpp"
 
 namespace llarp::sys
 {

diff --git a/llarp/util/service_manager.hpp b/llarp/util/service_manager.hpp
@@ -54,7 +54,11 @@ namespace llarp::sys
 
     /// report our current state to the system layer
     virtual void
-    report_our_state() = 0;
+    report_changed_state() = 0;
+
+    /// report our stats on each timer tick
+    virtual void
+    report_periodic_stats(){};
 
     void
     starting()
@@ -108,7 +112,7 @@ namespace llarp::sys
 
    public:
     void
-    report_our_state() override{};
+    report_changed_state() override{};
     void system_changed_our_state(ServiceState) override{};
   };
 }  // namespace llarp::sys
diff --git a/llarp/win32/service_manager.cpp b/llarp/win32/service_manager.cpp
@@ -53,7 +53,7 @@ namespace llarp::sys
   }
 
   void
-  SVC_Manager::report_our_state()
+  SVC_Manager::report_changed_state()
   {
     if (m_disable)
       return;
@@ -82,7 +82,7 @@ namespace llarp::sys
     {
       _status.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR;
       _status.dwServiceSpecificExitCode = 2;  // TODO: propagate more info ?
-      report_our_state();
+      report_changed_state();
     }
     else if (auto maybe_state = to_win32_state(st))
     {
@@ -104,9 +104,10 @@ namespace llarp::sys
         _status.dwCheckPoint++;
       else
         _status.dwCheckPoint = 0;
-
-      report_our_state();
+      
+      report_changed_state();
     }
+
   }
 
   SVC_Manager _manager{};

diff --git a/llarp/win32/service_manager.hpp b/llarp/win32/service_manager.hpp
@@ -27,7 +27,7 @@ namespace llarp::sys
     system_changed_our_state(ServiceState st) override;
 
     void
-    report_our_state() override;
+    report_changed_state() override;
 
     void
     we_changed_our_state(ServiceState st) override;