drop tunnel build message from the same peer if comes too often

This commit is contained in:
orignal
2026-02-03 14:35:20 -05:00
parent c66adab385
commit 9c1ffba49d
2 changed files with 24 additions and 8 deletions
+20 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2024, The PurpleI2P Project
* Copyright (c) 2013-2026, The PurpleI2P Project
*
* This file is part of Purple i2pd project and licensed under BSD3
*
@@ -71,8 +71,8 @@ namespace i2p
{
auto exp = GetExpiration ();
return (ts > exp + I2NP_MESSAGE_CLOCK_SKEW) || (ts < exp - 3*I2NP_MESSAGE_CLOCK_SKEW); // check if expired or too far in future
}
}
bool I2NPMessage::IsExpired () const
{
return IsExpired (i2p::util::GetMillisecondsSinceEpoch ());
@@ -424,11 +424,11 @@ namespace i2p
return msg;
}
else
{
{
auto newMsg = CreateTunnelGatewayMsg (tunnelID, msg->GetBuffer (), msg->GetLength ());
if (msg->onDrop) newMsg->onDrop = msg->onDrop;
if (msg->onDrop) newMsg->onDrop = msg->onDrop;
return newMsg;
}
}
}
std::shared_ptr<I2NPMessage> CreateTunnelGatewayMsg (uint32_t tunnelID, I2NPMessageType msgType,
@@ -498,7 +498,7 @@ namespace i2p
case eI2NPDatabaseSearchReply:
if (!msg->from || !msg->from->GetTunnelPool () || msg->from->GetTunnelPool ()->IsExploratory ())
i2p::data::netdb.PostDatabaseSearchReplyMsg (msg);
break;
break;
case eI2NPDatabaseLookup:
// forward to netDb if floodfill and came directly
if (!msg->from && i2p::context.IsFloodfill ())
@@ -552,6 +552,19 @@ namespace i2p
case eI2NPTunnelGateway:
m_TunnelGatewayMsgs.push_back (msg);
break;
case eI2NPVariableTunnelBuild:
case eI2NPTunnelBuild:
case eI2NPShortTunnelBuild:
{
auto ts = i2p::util::GetMonotonicMilliseconds ();
if (!m_LastTunnelBuildMessageTimestamp || ts > m_LastTunnelBuildMessageTimestamp + TUNNEL_BUILD_MESSAGES_MIN_INTERVAL)
{
m_LastTunnelBuildMessageTimestamp = ts;
HandleI2NPMessage (msg);
}
// else drop TBM
break;
}
default:
HandleI2NPMessage (msg);
}
+4 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013-2025, The PurpleI2P Project
* Copyright (c) 2013-2026, The PurpleI2P Project
*
* This file is part of Purple i2pd project and licensed under BSD3
*
@@ -319,10 +319,12 @@ namespace tunnel
size_t GetI2NPMessageLength (const uint8_t * msg, size_t len);
void HandleI2NPMessage (std::shared_ptr<I2NPMessage> msg);
const uint64_t TUNNEL_BUILD_MESSAGES_MIN_INTERVAL = 100; // in milliseconds
class I2NPMessagesHandler
{
public:
I2NPMessagesHandler (): m_LastTunnelBuildMessageTimestamp (0) {};
~I2NPMessagesHandler ();
void PutNextMessage (std::shared_ptr<I2NPMessage>&& msg);
void Flush ();
@@ -330,6 +332,7 @@ namespace tunnel
private:
std::list<std::shared_ptr<I2NPMessage> > m_TunnelMsgs, m_TunnelGatewayMsgs;
uint64_t m_LastTunnelBuildMessageTimestamp; // in milliseconds
};
}