client improvements

for real do correct timestamp comparison for introsets

include/llarp/ip.hpp

@@ -124,13 +124,13 @@ namespace llarp
       void
       src(uint32_t ip)
       {
-        Header()->saddr = htonl(ip);
+        Header()->saddr = ip;
       }
 
       void
       dst(uint32_t ip)
       {
-        Header()->daddr = htonl(ip);
+        Header()->daddr = ip;
       }
 
       // update ip packet checksum

include/llarp/service/Intro.hpp

@@ -31,14 +31,14 @@ namespace llarp
       bool
       IsExpired(llarp_time_t now) const
       {
-        return now <= expiresAt;
+        return now >= expiresAt;
       }
 
       bool
       ExpiresSoon(llarp_time_t now, llarp_time_t dlt = 5000) const
       {
         if(dlt)
-          return now <= (expiresAt - (llarp_randint() % dlt));
+          return now >= (expiresAt - (llarp_randint() % dlt));
         return IsExpired(now);
       }
 

include/llarp/service/endpoint.hpp

@@ -255,6 +255,9 @@ namespace llarp
       virtual void
       IntroSetPublished();
 
+      void
+      RegenAndPublishIntroSet(llarp_time_t now);
+
       IServiceLookup*
       GenerateLookupByTag(const Tag& tag);
 

llarp/handlers/tun.cpp

@@ -248,7 +248,7 @@ namespace llarp
       }
       if(m_NextIP < m_MaxIP)
       {
-        nextIP = htonl(++m_NextIP);
+        nextIP = ++m_NextIP;
         m_AddrToIP.insert(std::make_pair(addr, nextIP));
         m_IPToAddr.insert(std::make_pair(nextIP, addr));
       }

llarp/path.cpp

@@ -498,7 +498,8 @@ namespace llarp
         intro.expiresAt = buildStarted + hops[0].lifetime;
         // confirm that we build the path
         status = ePathEstablished;
-        llarp::LogInfo("path is confirmed tx=", TXID(), " rx=", RXID());
+        llarp::LogInfo("path is confirmed tx=", TXID(), " rx=", RXID(),
+                       " took ", llarp_time_now_ms() - buildStarted, " ms");
         if(m_BuiltHook)
           m_BuiltHook(this);
         m_BuiltHook = nullptr;

llarp/service.cpp

@@ -105,7 +105,7 @@ namespace llarp
       auto highest = now;
       for(const auto& i : I)
         highest = std::max(i.expiresAt, highest);
-      return highest >= now;
+      return highest <= now;
     }
 
     Introduction::~Introduction()

llarp/service/endpoint.cpp

@@ -84,6 +84,48 @@ namespace llarp
           != m_PendingServiceLookups.end();
     }
 
+    void
+    Endpoint::RegenAndPublishIntroSet(llarp_time_t now)
+    {
+      std::set< Introduction > I;
+      if(!GetCurrentIntroductions(I))
+      {
+        llarp::LogWarn("could not publish descriptors for endpoint ", Name(),
+                       " because we couldn't get any introductions");
+        if(ShouldBuildMore())
+          ManualRebuild(1);
+        return;
+      }
+      IntroSet introset = m_IntroSet;
+      introset.I.clear();
+      for(const auto& intro : I)
+      {
+        llarp::LogInfo(intro);
+        if(!intro.ExpiresSoon(now))
+          introset.I.push_back(intro);
+      }
+      if(introset.I.size() == 0)
+      {
+        llarp::LogWarn("not enough intros to publish introset for ", Name());
+        return;
+      }
+      introset.topic = m_Tag;
+      if(!m_Identity.SignIntroSet(introset, &m_Router->crypto))
+      {
+        llarp::LogWarn("failed to sign introset for endpoint ", Name());
+        return;
+      }
+      m_IntroSet = introset;
+      if(PublishIntroSet(m_Router))
+      {
+        llarp::LogInfo("publishing introset for endpoint ", Name());
+      }
+      else
+      {
+        llarp::LogWarn("failed to publish intro set for endpoint ", Name());
+      }
+    }
+
     void
     Endpoint::Tick(llarp_time_t now)
     {
@@ -93,32 +135,7 @@ namespace llarp
       // publish descriptors
       if(ShouldPublishDescriptors(now))
       {
-        std::set< Introduction > I;
+        RegenAndPublishIntroSet(now);
-        if(!GetCurrentIntroductions(I))
-        {
-          llarp::LogWarn("could not publish descriptors for endpoint ", Name(),
-                         " because we couldn't get any introductions");
-          if(ShouldBuildMore())
-            ManualRebuild(1);
-          return;
-        }
-        m_IntroSet.I.clear();
-        for(const auto& intro : I)
-          m_IntroSet.I.push_back(intro);
-        m_IntroSet.topic = m_Tag;
-        if(!m_Identity.SignIntroSet(m_IntroSet, &m_Router->crypto))
-        {
-          llarp::LogWarn("failed to sign introset for endpoint ", Name());
-          return;
-        }
-        if(PublishIntroSet(m_Router))
-        {
-          llarp::LogInfo("publishing introset for endpoint ", Name());
-        }
-        else
-        {
-          llarp::LogWarn("failed to publish intro set for endpoint ", Name());
-        }
       }
       // expire pending tx
       {
@@ -448,7 +465,7 @@ namespace llarp
     bool
     Endpoint::PublishIntroSet(llarp_router* r)
     {
-      auto path = GetEstablishedPathClosestTo(m_Identity.pub.Addr().ToRouter());
+      auto path = PickRandomEstablishedPath();
       if(path)
       {
         m_CurrentPublishTX = llarp_randint();
@@ -478,8 +495,8 @@ namespace llarp
     {
       if(m_IntroSet.HasExpiredIntros(now))
         return now - m_LastPublishAttempt >= INTROSET_PUBLISH_RETRY_INTERVAL;
-      return m_CurrentPublishTX == 0
+      return now - m_LastPublish >= INTROSET_PUBLISH_INTERVAL
-          && now - m_LastPublish >= INTROSET_PUBLISH_INTERVAL;
+          && m_CurrentPublishTX == 0;
     }
 
     void
@@ -628,6 +645,7 @@ namespace llarp
     {
       p->SetDataHandler(std::bind(&Endpoint::HandleHiddenServiceFrame, this,
                                   std::placeholders::_1));
+      RegenAndPublishIntroSet(llarp_time_now_ms());
     }
 
     bool