Merge pull request #2128 from majestrate/oxend-defer-ping-2023-01-29

ping oxend after getting identity keys

llarp/router/router.cpp

@@ -361,6 +361,7 @@ namespace llarp
           _identity = RpcClient()->ObtainIdentityKey();
           const RouterID pk{pubkey()};
           LogWarn("Obtained lokid identity key: ", pk);
+          RpcClient()->StartPings();
           break;
         }
         catch (const std::exception& e)

llarp/rpc/lokid_rpc_client.cpp

@@ -64,7 +64,7 @@ namespace llarp
         LogInfo("connecting to lokid via LMQ at ", url.full_address());
         m_Connection = m_lokiMQ->connect_remote(
             url,
-            [self = shared_from_this()](oxenmq::ConnectionID) { self->Connected(); },
+            [](oxenmq::ConnectionID) {},
             [self = shared_from_this(), url](oxenmq::ConnectionID, std::string_view f) {
               llarp::LogWarn("Failed to connect to lokid: ", f);
               if (auto router = self->m_Router.lock())
@@ -168,7 +168,7 @@ namespace llarp
     }
 
     void
-    LokidRpcClient::Connected()
+    LokidRpcClient::StartPings()
     {
       constexpr auto PingInterval = 30s;
       auto makePingRequest = [self = shared_from_this()]() {

llarp/rpc/lokid_rpc_client.hpp

@@ -46,11 +46,10 @@ namespace llarp
       void
       InformConnection(RouterID router, bool success);
 
-     private:
-      /// called when we have connected to lokid via lokimq
       void
-      Connected();
+      StartPings();
 
+     private:
       /// do a lmq command on the current connection
       void
       Command(std::string_view cmd);