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

correct values for last ack range

Browse source
This commit is contained in:
orignal 2022-06-12 16:54:02 -04:00
parent f7b6db5dad
commit b72d1237d2
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libi2pd/SSU2Session.cpp
View file

@ -1607,14 +1607,14 @@ namespace transport
} }
// ranges // ranges
uint32_t lastNum = ackThrough - acnt; uint32_t lastNum = ackThrough - acnt;
while (it != m_OutOfSequencePackets.rend () && lastNum > m_ReceivePacketNum && numRanges < SSU2_MAX_NUM_ACK_RANGES) while (it != m_OutOfSequencePackets.rend () && numRanges < SSU2_MAX_NUM_ACK_RANGES)
{ {
if (lastNum - (*it) < 255) if (lastNum - (*it) < 255)
{ {
buf[7 + numRanges*2] = lastNum - (*it) - 1; // NACKs buf[7 + numRanges*2] = lastNum - (*it) - 1; // NACKs
lastNum = *it; it++; lastNum = *it; it++;
uint8_t numAcks = 1; uint8_t numAcks = 1;
while (it != m_OutOfSequencePackets.rend () && numAcks < 255 && lastNum > m_ReceivePacketNum && *it == lastNum - 1) while (it != m_OutOfSequencePackets.rend () && numAcks < 255 && lastNum > 0 && *it == lastNum - 1)
{ {
numAcks++; lastNum--; numAcks++; lastNum--;
it++; it++;
@ -1626,12 +1626,17 @@ namespace transport
else else
break; break;
} }
if (numRanges < SSU2_MAX_NUM_ACK_RANGES && m_ReceivePacketNum) if (numRanges < SSU2_MAX_NUM_ACK_RANGES && it == m_OutOfSequencePackets.rend ())
{ {
// add received packets to last range // add range between out-of-seqence and received
int numAcks = buf[7 + numRanges*2 + 1] + m_ReceivePacketNum; int nacks = *m_OutOfSequencePackets.begin () - m_ReceivePacketNum - 1;
if (numAcks > 255) numAcks = 255; if (nacks > 0)
buf[7 + numRanges*2 + 1] = numAcks; {
if (nacks > 255) nacks = 255;
buf[7 + numRanges*2] = nacks;
buf[7 + numRanges*2 + 1] = std::min ((int)m_ReceivePacketNum, 255);
numRanges++;
}
} }
} }
} }