|
|
@ -615,7 +615,7 @@ namespace data |
|
|
|
uint8_t flag = buf[64]; |
|
|
|
uint8_t flag = buf[64]; |
|
|
|
LogPrint (eLogDebug, "NetDb: DatabaseLookup for ", key, " recieved flags=", (int)flag); |
|
|
|
LogPrint (eLogDebug, "NetDb: DatabaseLookup for ", key, " recieved flags=", (int)flag); |
|
|
|
uint8_t lookupType = flag & DATABASE_LOOKUP_TYPE_FLAGS_MASK; |
|
|
|
uint8_t lookupType = flag & DATABASE_LOOKUP_TYPE_FLAGS_MASK; |
|
|
|
const uint8_t * excluded = buf + 65; |
|
|
|
uint8_t * excluded = buf + 65; |
|
|
|
uint32_t replyTunnelID = 0; |
|
|
|
uint32_t replyTunnelID = 0; |
|
|
|
if (flag & DATABASE_LOOKUP_DELIVERY_FLAG) //reply to tunnel
|
|
|
|
if (flag & DATABASE_LOOKUP_DELIVERY_FLAG) //reply to tunnel
|
|
|
|
{ |
|
|
|
{ |
|
|
@ -671,7 +671,12 @@ namespace data |
|
|
|
lookupType == DATABASE_LOOKUP_TYPE_NORMAL_LOOKUP)) |
|
|
|
lookupType == DATABASE_LOOKUP_TYPE_NORMAL_LOOKUP)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
auto leaseSet = FindLeaseSet (ident); |
|
|
|
auto leaseSet = FindLeaseSet (ident); |
|
|
|
if (leaseSet && !leaseSet->IsExpired ()) // we don't send back our LeaseSets
|
|
|
|
if (!leaseSet) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
// no lease set found
|
|
|
|
|
|
|
|
LogPrint(eLogDebug, "NetDb: requested LeaseSet not found ident=", ident); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else if (leaseSet->IsExpired ()) // we don't send back our LeaseSets
|
|
|
|
{ |
|
|
|
{ |
|
|
|
LogPrint (eLogDebug, "NetDb: requested LeaseSet ", key, " found"); |
|
|
|
LogPrint (eLogDebug, "NetDb: requested LeaseSet ", key, " found"); |
|
|
|
replyMsg = CreateDatabaseStoreMsg (leaseSet); |
|
|
|
replyMsg = CreateDatabaseStoreMsg (leaseSet); |
|
|
|