From e11e83c397b0e7c4dbceae185c75d4d68f34f261 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Thu, 29 Nov 2018 09:18:53 -0500
Subject: [PATCH] fix pathbuilder

---
 llarp/pathbuilder.cpp      | 8 ++++----
 llarp/service/endpoint.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/llarp/pathbuilder.cpp b/llarp/pathbuilder.cpp
index 6a5f5d712..29c4e537a 100644
--- a/llarp/pathbuilder.cpp
+++ b/llarp/pathbuilder.cpp
@@ -179,17 +179,17 @@ namespace llarp
                        RouterContact& cur, size_t hop, PathRole roles)
     {
       (void)roles;
-      if(hop == 0 && router->NumberOfConnectedRouters())
-        return router->GetRandomConnectedRouter(cur);
+      if(hop == 0)
+        return router->NumberOfConnectedRouters() && router->GetRandomConnectedRouter(cur);
 
       size_t tries = 5;
       do
       {
         --tries;
         if(llarp_nodedb_select_random_hop(db, prev, cur, hop))
-          break;
+          return true;
       } while(router->routerProfiling.IsBad(cur.pubkey) && tries > 0);
-      return !router->routerProfiling.IsBad(cur.pubkey);
+      return false;
     }
 
     const byte_t*
diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index e4cedb0d8..03025558d 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -1203,7 +1203,7 @@ namespace llarp
             if(!router->GetRandomConnectedRouter(hops[0]))
               return false;
           }
-          else if(!llarp_nodedb_select_random_hop(nodedb, hops[0], hops[0], 0))
+          else
             return false;
         }
         else if(hop == numHops - 1)