|
|
@ -1019,6 +1019,11 @@ namespace data
|
|
|
|
std::shared_ptr<I2NPMessage> replyMsg;
|
|
|
|
std::shared_ptr<I2NPMessage> replyMsg;
|
|
|
|
if (lookupType == DATABASE_LOOKUP_TYPE_EXPLORATORY_LOOKUP)
|
|
|
|
if (lookupType == DATABASE_LOOKUP_TYPE_EXPLORATORY_LOOKUP)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
if (!context.IsFloodfill ())
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
LogPrint (eLogWarning, "NetDb: Exploratory lookup to non-floodfill dropped");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
LogPrint (eLogInfo, "NetDb: Exploratory close to ", key, " ", numExcluded, " excluded");
|
|
|
|
LogPrint (eLogInfo, "NetDb: Exploratory close to ", key, " ", numExcluded, " excluded");
|
|
|
|
std::set<IdentHash> excludedRouters;
|
|
|
|
std::set<IdentHash> excludedRouters;
|
|
|
|
const uint8_t * excluded_ident = excluded;
|
|
|
|
const uint8_t * excluded_ident = excluded;
|
|
|
@ -1044,6 +1049,7 @@ namespace data
|
|
|
|
if (lookupType == DATABASE_LOOKUP_TYPE_ROUTERINFO_LOOKUP ||
|
|
|
|
if (lookupType == DATABASE_LOOKUP_TYPE_ROUTERINFO_LOOKUP ||
|
|
|
|
lookupType == DATABASE_LOOKUP_TYPE_NORMAL_LOOKUP)
|
|
|
|
lookupType == DATABASE_LOOKUP_TYPE_NORMAL_LOOKUP)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
// try to find router
|
|
|
|
auto router = FindRouter (ident);
|
|
|
|
auto router = FindRouter (ident);
|
|
|
|
if (router && !router->IsUnreachable ())
|
|
|
|
if (router && !router->IsUnreachable ())
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1055,6 +1061,9 @@ namespace data
|
|
|
|
|
|
|
|
|
|
|
|
if (!replyMsg && (lookupType == DATABASE_LOOKUP_TYPE_LEASESET_LOOKUP ||
|
|
|
|
if (!replyMsg && (lookupType == DATABASE_LOOKUP_TYPE_LEASESET_LOOKUP ||
|
|
|
|
lookupType == DATABASE_LOOKUP_TYPE_NORMAL_LOOKUP))
|
|
|
|
lookupType == DATABASE_LOOKUP_TYPE_NORMAL_LOOKUP))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
// try to find leaseset
|
|
|
|
|
|
|
|
if (context.IsFloodfill ())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
auto leaseSet = FindLeaseSet (ident);
|
|
|
|
auto leaseSet = FindLeaseSet (ident);
|
|
|
|
if (!leaseSet)
|
|
|
|
if (!leaseSet)
|
|
|
@ -1062,12 +1071,18 @@ namespace data
|
|
|
|
// no leaseset found
|
|
|
|
// no leaseset found
|
|
|
|
LogPrint(eLogDebug, "NetDb: Requested LeaseSet not found for ", ident.ToBase32());
|
|
|
|
LogPrint(eLogDebug, "NetDb: Requested LeaseSet not found for ", ident.ToBase32());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (!leaseSet->IsExpired ()) // we don't send back our LeaseSets
|
|
|
|
else if (!leaseSet->IsExpired ()) // we don't send back expired leasesets
|
|
|
|
{
|
|
|
|
{
|
|
|
|
LogPrint (eLogDebug, "NetDb: Requested LeaseSet ", key, " found");
|
|
|
|
LogPrint (eLogDebug, "NetDb: Requested LeaseSet ", key, " found");
|
|
|
|
replyMsg = CreateDatabaseStoreMsg (ident, leaseSet);
|
|
|
|
replyMsg = CreateDatabaseStoreMsg (ident, leaseSet);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (lookupType == DATABASE_LOOKUP_TYPE_LEASESET_LOOKUP)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
LogPrint (eLogWarning, "NetDb: Explicit LeaseSet lookup to non-floodfill dropped");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!replyMsg)
|
|
|
|
if (!replyMsg)
|
|
|
|
{
|
|
|
|
{
|
|
|
|