Merge remote-tracking branch 'purple/openssl' into meshnet

This commit is contained in:
Jeff Becker 2016-06-30 10:25:44 -04:00
commit eb31accf20
No known key found for this signature in database
GPG Key ID: AB950234D6EA286B

View File

@ -497,15 +497,16 @@ namespace data
memcpy (payload + DATABASE_STORE_HEADER_SIZE, buf + payloadOffset, msgLen); memcpy (payload + DATABASE_STORE_HEADER_SIZE, buf + payloadOffset, msgLen);
floodMsg->FillI2NPMessageHeader (eI2NPDatabaseStore); floodMsg->FillI2NPMessageHeader (eI2NPDatabaseStore);
std::set<IdentHash> excluded; std::set<IdentHash> excluded;
for (int i = 0; i < 3; i++) excluded.insert (i2p::context.GetIdentHash ()); // don't flood to itself
for (int i = 0; i < 3; i++)
{ {
auto floodfill = GetClosestFloodfill (ident, excluded); auto floodfill = GetClosestFloodfill (ident, excluded);
if (floodfill) if (floodfill)
{ {
auto h = floodfill->GetIdentHash(); auto h = floodfill->GetIdentHash();
excluded.insert(h);
LogPrint(eLogDebug, "NetDb: Flood lease set for ", ident.ToBase32(), " to ", h.ToBase64()); LogPrint(eLogDebug, "NetDb: Flood lease set for ", ident.ToBase32(), " to ", h.ToBase64());
transports.SendMessage (h, floodMsg); transports.SendMessage (h, floodMsg);
excluded.insert (h);
} }
else else
break; break;