mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-09-20 02:10:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

delete invalid router after update

Browse Source
This commit is contained in:
orignal 2023-02-12 18:02:16 -05:00
parent 7bde4de1f5
commit d15581d95e
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libi2pd/NetDb.cpp
View File

@ -276,7 +276,22 @@ namespace data
bool wasFloodfill = r->IsFloodfill (); bool wasFloodfill = r->IsFloodfill ();
{ {
std::unique_lock<std::mutex> l(m_RouterInfosMutex); std::unique_lock<std::mutex> l(m_RouterInfosMutex);
r->Update (buf, len); if (!r->Update (buf, len))
{
updated = false;
return r;
}
if (r->IsUnreachable ())
{
// delete router as invalid after update
m_RouterInfos.erase (ident);
if (wasFloodfill)
{
std::unique_lock<std::mutex> l(m_FloodfillsMutex);
m_Floodfills.remove (r);
}
return nullptr;
}
} }
LogPrint (eLogInfo, "NetDb: RouterInfo updated: ", ident.ToBase64()); LogPrint (eLogInfo, "NetDb: RouterInfo updated: ", ident.ToBase64());
if (wasFloodfill != r->IsFloodfill ()) // if floodfill status updated if (wasFloodfill != r->IsFloodfill ()) // if floodfill status updated

16
libi2pd/RouterInfo.cpp
View File

@ -79,13 +79,12 @@ namespace data
{ {
} }
void RouterInfo::Update (const uint8_t * buf, size_t len) bool RouterInfo::Update (const uint8_t * buf, size_t len)
{ {
if (len > MAX_RI_BUFFER_SIZE) if (len > MAX_RI_BUFFER_SIZE)
{ {
LogPrint (eLogError, "RouterInfo: Buffer is too long ", len); LogPrint (eLogWarning, "RouterInfo: Updated buffer is too long ", len, ". Not changed");
m_IsUnreachable = true; return false;
return;
} }
// verify signature since we have identity already // verify signature since we have identity already
int l = len - m_RouterIdentity->GetSignatureLen (); int l = len - m_RouterIdentity->GetSignatureLen ();
@ -109,10 +108,11 @@ namespace data
// don't delete buffer until saved to the file // don't delete buffer until saved to the file
} }
else else
{ {
LogPrint (eLogError, "RouterInfo: Signature verification failed"); LogPrint (eLogWarning, "RouterInfo: Updated signature verification failed. Not changed");
m_IsUnreachable = true; return false;
} }
return true;
} }
void RouterInfo::SetRouterIdentity (std::shared_ptr<const IdentityEx> identity) void RouterInfo::SetRouterIdentity (std::shared_ptr<const IdentityEx> identity)

2
libi2pd/RouterInfo.h
View File

@ -253,7 +253,7 @@ namespace data
std::shared_ptr<RouterProfile> GetProfile () const; std::shared_ptr<RouterProfile> GetProfile () const;
void DropProfile () { m_Profile = nullptr; }; void DropProfile () { m_Profile = nullptr; };
void Update (const uint8_t * buf, size_t len); bool Update (const uint8_t * buf, size_t len);
void DeleteBuffer () { m_Buffer = nullptr; }; void DeleteBuffer () { m_Buffer = nullptr; };
bool IsNewer (const uint8_t * buf, size_t len) const; bool IsNewer (const uint8_t * buf, size_t len) const;