From 4e5f5c218a22b3041db8d020acc9c8a3bcac9e02 Mon Sep 17 00:00:00 2001 From: orignal Date: Mon, 8 Jul 2024 08:00:36 -0400 Subject: [PATCH] mark router as dup0licted only if address mismatch --- libi2pd/SSU2Session.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libi2pd/SSU2Session.cpp b/libi2pd/SSU2Session.cpp index b0338666..ada2078e 100644 --- a/libi2pd/SSU2Session.cpp +++ b/libi2pd/SSU2Session.cpp @@ -1132,14 +1132,11 @@ namespace transport LogPrint (eLogError, "SSU2: Couldn't update RouterInfo from SessionConfirmed in netdb"); return false; } - if (ri->GetTimestamp () + i2p::data::NETDB_EXPIRATION_TIMEOUT_THRESHOLD*1000LL >= ri1->GetTimestamp ()) - ri = ri1; // received RouterInfo is not older than one in netdb - else - { - // othewise we assume duplicate - auto profile = i2p::data::GetRouterProfile (ri->GetIdentHash ()); - if (profile) profile->Duplicated (); // mark router as duplicated in profile - } + bool isOlder = false; + if (ri->GetTimestamp () + i2p::data::NETDB_EXPIRATION_TIMEOUT_THRESHOLD*1000LL < ri1->GetTimestamp ()) + // received RouterInfo is older than one in netdb + isOlder = true; + ri = ri1; m_Address = m_RemoteEndpoint.address ().is_v6 () ? ri->GetSSU2V6Address () : ri->GetSSU2V4Address (); if (!m_Address || memcmp (S, m_Address->s, 32)) @@ -1151,8 +1148,14 @@ namespace transport (!m_RemoteEndpoint.address ().is_v6 () || memcmp (m_RemoteEndpoint.address ().to_v6 ().to_bytes ().data (), m_Address->host.to_v6 ().to_bytes ().data (), 8))) // temporary address { - LogPrint (eLogError, "SSU2: Host mismatch between published address ", m_Address->host, - " and actual endpoint ", m_RemoteEndpoint.address (), " from ", i2p::data::GetIdentHashAbbreviation (ri->GetIdentHash ())); + if (isOlder) + { + auto profile = i2p::data::GetRouterProfile (ri->GetIdentHash ()); + if (profile) profile->Duplicated (); // mark router as duplicated in profile + } + else + LogPrint (eLogError, "SSU2: Host mismatch between published address ", m_Address->host, + " and actual endpoint ", m_RemoteEndpoint.address (), " from ", i2p::data::GetIdentHashAbbreviation (ri->GetIdentHash ())); return false; } SetRemoteIdentity (ri->GetRouterIdentity ());