From 5938cec770ea35a5d491fe72b666a723c456fcda Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Tue, 16 Apr 2019 14:06:12 -0400 Subject: [PATCH] fix gotrouter handling --- llarp/dht/messages/gotrouter.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/llarp/dht/messages/gotrouter.cpp b/llarp/dht/messages/gotrouter.cpp index 0045867bb..e123ededa 100644 --- a/llarp/dht/messages/gotrouter.cpp +++ b/llarp/dht/messages/gotrouter.cpp @@ -93,7 +93,7 @@ namespace llarp return pathset && pathset->HandleGotRouterMessage(this); } // not relayed - TXOwner owner(From, txid); + const TXOwner owner(From, txid); if(dht.pendingExploreLookups().HasPendingLookupFrom(owner)) { @@ -106,20 +106,16 @@ namespace llarp return true; } // not explore lookup - - if(!dht.pendingRouterLookups().HasPendingLookupFrom(owner)) + if(dht.pendingRouterLookups().HasPendingLookupFrom(owner)) { - llarp::LogWarn("Unwarranted GRM from ", From, " txid=", txid); - return false; + if(R.size() == 0) + dht.pendingRouterLookups().NotFound(owner, K); + else + dht.pendingRouterLookups().Found(owner, R[0].pubkey, R); + return true; } - // no pending lookup - - llarp::LogInfo("DHT no pending lookup"); - if(R.size() == 1) - dht.pendingRouterLookups().Found(owner, R[0].pubkey, {R[0]}); - else - dht.pendingRouterLookups().NotFound(owner, K); - return true; + llarp::LogWarn("Unwarranted GRM from ", From, " txid=", txid); + return false; } } // namespace dht } // namespace llarp