From 562de3514a816d51c392563a6feecc50e610c42b Mon Sep 17 00:00:00 2001 From: orignal Date: Sun, 12 Apr 2015 15:54:28 -0400 Subject: [PATCH] check database lookup type --- NetDb.cpp | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/NetDb.cpp b/NetDb.cpp index 39a5b4ff..7cf0498e 100644 --- a/NetDb.cpp +++ b/NetDb.cpp @@ -688,16 +688,21 @@ namespace data } else { - auto router = FindRouter (buf); - if (router) - { - LogPrint ("Requested RouterInfo ", key, " found"); - router->LoadBuffer (); - if (router->GetBuffer ()) - replyMsg = CreateDatabaseStoreMsg (router); + if (lookupType == DATABASE_LOOKUP_TYPE_ROUTERINFO_LOOKUP || + lookupType == DATABASE_LOOKUP_TYPE_NORMAL_LOOKUP) + { + auto router = FindRouter (buf); + if (router) + { + LogPrint ("Requested RouterInfo ", key, " found"); + router->LoadBuffer (); + if (router->GetBuffer ()) + replyMsg = CreateDatabaseStoreMsg (router); + } } - - if (!replyMsg) + + if (!replyMsg && (lookupType == DATABASE_LOOKUP_TYPE_LEASESET_LOOKUP || + lookupType == DATABASE_LOOKUP_TYPE_NORMAL_LOOKUP)) { auto leaseSet = FindLeaseSet (buf); if (leaseSet) // we don't send back our LeaseSets @@ -706,6 +711,7 @@ namespace data replyMsg = CreateDatabaseStoreMsg (leaseSet); } } + if (!replyMsg) { LogPrint ("Requested ", key, " not found. ", numExcluded, " excluded");