Browse Source

don't insert same floodfill twice

pull/712/head
orignal 8 years ago
parent
commit
336cd60920
  1. 23
      NetDb.cpp

23
NetDb.cpp

@ -188,23 +188,34 @@ namespace data
// TODO: check if floodfill has been changed // TODO: check if floodfill has been changed
} }
else else
{
LogPrint (eLogDebug, "NetDb: RouterInfo is older: ", ident.ToBase64()); LogPrint (eLogDebug, "NetDb: RouterInfo is older: ", ident.ToBase64());
updated = false;
}
} }
else else
{ {
r = std::make_shared<RouterInfo> (buf, len); r = std::make_shared<RouterInfo> (buf, len);
if (!r->IsUnreachable ()) if (!r->IsUnreachable ())
{ {
LogPrint (eLogInfo, "NetDb: RouterInfo added: ", ident.ToBase64()); bool inserted = false;
{ {
std::unique_lock<std::mutex> l(m_RouterInfosMutex); std::unique_lock<std::mutex> l(m_RouterInfosMutex);
m_RouterInfos[r->GetIdentHash ()] = r; inserted = m_RouterInfos.insert ({r->GetIdentHash (), r}).second;
} }
if (r->IsFloodfill () && r->IsReachable ()) // floodfill must be reachable if (inserted)
{
LogPrint (eLogInfo, "NetDb: RouterInfo added: ", ident.ToBase64());
if (r->IsFloodfill () && r->IsReachable ()) // floodfill must be reachable
{
std::unique_lock<std::mutex> l(m_FloodfillsMutex);
m_Floodfills.push_back (r);
}
}
else
{ {
std::unique_lock<std::mutex> l(m_FloodfillsMutex); LogPrint (eLogWarning, "NetDb: Duplicated RouterInfo ", ident.ToBase64());
m_Floodfills.push_back (r); updated = false;
} }
} }
else else

Loading…
Cancel
Save