Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-28 11:47:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

hanlde Ack block

Browse source
This commit is contained in:
orignal 2022-03-30 15:03:45 -04:00
parent dd774b8dfd
commit f9925c7374
2 changed files with 43 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
libi2pd/SSU2.cpp
View file

@ -582,9 +582,11 @@ namespace transport
}
m_LastActivityTimestamp = i2p::util::GetSecondsSinceEpoch ();
m_NumReceivedBytes += len;
UpdateReceivePacketNum (packetNum);
if (HandlePayload (payload, payloadSize))
SendQuickAck (); // TODO: don't send too requently
if (UpdateReceivePacketNum (packetNum))
{
if (HandlePayload (payload, payloadSize))
SendQuickAck (); // TODO: don't send too requently
}
}
bool SSU2Session::HandlePayload (const uint8_t * buf, size_t len)
@ -652,6 +654,8 @@ namespace transport
case eSSU2BlkNextNonce:
break;
case eSSU2BlkAck:
LogPrint (eLogDebug, "SSU2: Ack");
HandleAck (buf + offset, size);
break;
case eSSU2BlkAddress:
{
@ -692,6 +696,26 @@ namespace transport
return isData;
}
void SSU2Session::HandleAck (const uint8_t * buf, size_t len)
{
if (m_SentPackets.empty ()) return;
uint32_t ackThrough = bufbe32toh (buf);
auto it = m_SentPackets.rbegin ();
while (it != m_SentPackets.rend () && it->first > ackThrough) ++it; // find first less pack <= ackThrough
if (it == m_SentPackets.rend ()) return;
int32_t firstPacketNum = ackThrough - buf[4]; // acnt
if (firstPacketNum < 0) firstPacketNum = 0;
auto it1 = it;
while (it1 != m_SentPackets.rend () && it1->first >= (uint32_t)firstPacketNum) it1++;
if (it1 == m_SentPackets.rend ())
{
m_SentPackets.erase (m_SentPackets.begin (), it.base ());
return;
}
m_SentPackets.erase (it1.base (), it.base ());
// TODO: handle ranges
}
bool SSU2Session::ExtractEndpoint (const uint8_t * buf, size_t size, boost::asio::ip::udp::endpoint& ep)
{
if (size < 2) return false;
@ -800,9 +824,9 @@ namespace transport
htole64buf (nonce + 4, seqn);
}
void SSU2Session::UpdateReceivePacketNum (uint32_t packetNum)
bool SSU2Session::UpdateReceivePacketNum (uint32_t packetNum)
{
if (packetNum <= m_ReceivePacketNum) return; // duplicate
if (packetNum <= m_ReceivePacketNum) return false; // duplicate
if (packetNum == m_ReceivePacketNum + 1)
{
for (auto it = m_OutOfSequencePackets.begin (); it != m_OutOfSequencePackets.end ();)
@ -819,6 +843,7 @@ namespace transport
}
else
m_OutOfSequencePackets.insert (packetNum);
return true;
}
void SSU2Session::SendQuickAck ()