Browse Source

check out of sequence messages range

pull/1776/head
orignal 2 years ago
parent
commit
c50e453af6
  1. 35
      libi2pd/SSU2Session.cpp

35
libi2pd/SSU2Session.cpp

@ -1174,7 +1174,7 @@ namespace transport
m_IsDataReceived = true; m_IsDataReceived = true;
break; break;
case eSSU2BlkTermination: case eSSU2BlkTermination:
LogPrint (eLogDebug, "SSU2: Termination"); LogPrint (eLogDebug, "SSU2: Termination reason=", (int)buf[11]);
Terminate (); Terminate ();
break; break;
case eSSU2BlkRelayRequest: case eSSU2BlkRelayRequest:
@ -2210,23 +2210,28 @@ namespace transport
else else
++it; ++it;
} }
if (m_OutOfSequencePackets.size () > 255) if (!m_OutOfSequencePackets.empty ())
{ {
m_ReceivePacketNum = *m_OutOfSequencePackets.rbegin (); if (m_OutOfSequencePackets.size () > 2*SSU2_MAX_NUM_ACK_RANGES ||
m_OutOfSequencePackets.clear (); *m_OutOfSequencePackets.rbegin () > m_ReceivePacketNum + 255*8)
} {
else if (m_OutOfSequencePackets.size () > SSU2_MAX_NUM_ACK_RANGES) uint32_t packet = *m_OutOfSequencePackets.begin ();
{ if (packet > m_ReceivePacketNum + 1)
uint32_t packet = *m_OutOfSequencePackets.begin (); {
if (packet > m_ReceivePacketNum + 1) // like we've just received all packets before first
packet--;
m_ReceivePacketNum = packet - 1;
UpdateReceivePacketNum (packet);
}
else
LogPrint (eLogError, "SSU2: Out of sequence packet ", packet, " is less than last received ", m_ReceivePacketNum);
}
if (m_OutOfSequencePackets.size () > 255*4)
{ {
// like we've just received all packets before first // seems we have a serious network issue
packet--; m_ReceivePacketNum = *m_OutOfSequencePackets.rbegin ();
m_ReceivePacketNum = packet - 1; m_OutOfSequencePackets.clear ();
UpdateReceivePacketNum (packet);
} }
else
LogPrint (eLogError, "SSU2: Out of sequence packet ", packet, " is less than last received ", m_ReceivePacketNum);
} }
for (auto it = m_RelaySessions.begin (); it != m_RelaySessions.end ();) for (auto it = m_RelaySessions.begin (); it != m_RelaySessions.end ();)

Loading…
Cancel
Save