Merge pull request #439 from majestrate/master

staging

llarp/path/pathbuilder.cpp

@@ -345,7 +345,7 @@ namespace llarp
       static constexpr llarp_time_t MaxBuildInterval = 30 * 1000;
       buildIntervalLimit =
           std::min(1000 + buildIntervalLimit, MaxBuildInterval);
-      // router->routerProfiling().MarkPathFail(p);
+      router->routerProfiling().MarkPathFail(p);
       PathSet::HandlePathBuildTimeout(p);
     }
 

llarp/router/router.cpp

@@ -161,6 +161,9 @@ namespace llarp
   bool
   Router::TryConnectAsync(RouterContact remote, uint16_t numretries)
   {
+    const RouterID us = pubkey();
+    if(remote.pubkey == us)
+      return false;
     // do we already have a pending job for this remote?
     if(HasPendingConnectJob(remote.pubkey))
     {
@@ -611,6 +614,9 @@ namespace llarp
   void
   Router::TryEstablishTo(const RouterID &remote)
   {
+    const RouterID us = pubkey();
+    if(us == remote)
+      return;
     if(!ConnectionToRouterAllowed(remote))
     {
       LogWarn("not connecting to ", remote, " as it's not permitted by config");