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

terminate NTCP2 session from duplicated router properly

Browse Source
This commit is contained in:
orignal 2024-09-10 12:35:36 -04:00
parent 261acbbd66
commit 272bf7dbc1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libi2pd/NTCP2.cpp
View File

@ -729,6 +729,7 @@ namespace transport
if (!ri1) if (!ri1)
{ {
LogPrint (eLogError, "NTCP2: Couldn't update RouterInfo from SessionConfirmed in netdb"); LogPrint (eLogError, "NTCP2: Couldn't update RouterInfo from SessionConfirmed in netdb");
Terminate ();
return; return;
} }
std::shared_ptr<i2p::data::RouterProfile> profile; // not null if older std::shared_ptr<i2p::data::RouterProfile> profile; // not null if older
@ -737,8 +738,11 @@ namespace transport
// received RouterInfo is older than one in netdb // received RouterInfo is older than one in netdb
profile = i2p::data::GetRouterProfile (ri1->GetIdentHash ()); // retrieve profile profile = i2p::data::GetRouterProfile (ri1->GetIdentHash ()); // retrieve profile
if (profile && profile->IsDuplicated ()) if (profile && profile->IsDuplicated ())
{
SendTerminationAndTerminate (eNTCP2Banned);
return; return;
} }
}
auto addr = m_RemoteEndpoint.address ().is_v4 () ? ri1->GetNTCP2V4Address () : auto addr = m_RemoteEndpoint.address ().is_v4 () ? ri1->GetNTCP2V4Address () :
(i2p::util::net::IsYggdrasilAddress (m_RemoteEndpoint.address ()) ? ri1->GetYggdrasilAddress () : ri1->GetNTCP2V6Address ()); (i2p::util::net::IsYggdrasilAddress (m_RemoteEndpoint.address ()) ? ri1->GetYggdrasilAddress () : ri1->GetNTCP2V6Address ());
@ -756,8 +760,8 @@ namespace transport
if (profile) // older router? if (profile) // older router?
profile->Duplicated (); // mark router as duplicated in profile profile->Duplicated (); // mark router as duplicated in profile
else else
LogPrint (eLogError, "NTCP2: Host mismatch between published address ", addr->host, " and actual endpoint ", m_RemoteEndpoint.address ()); LogPrint (eLogInfo, "NTCP2: Host mismatch between published address ", addr->host, " and actual endpoint ", m_RemoteEndpoint.address ());
Terminate (); SendTerminationAndTerminate (eNTCP2Banned);
return; return;
} }
// TODO: process options // TODO: process options