NACKs and Acks only Ack ranges

This commit is contained in:
orignal 2022-07-10 18:50:02 -04:00
parent fdebbc4498
commit 8b649aaaf8

View file

@ -1917,22 +1917,38 @@ namespace transport
uint32_t lastNum = ackThrough - acnt; uint32_t lastNum = ackThrough - acnt;
while (it != m_OutOfSequencePackets.rend () && 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)
{ {
// NACKs only ranges
if (lastNum > (*it) + 255*(SSU2_MAX_NUM_ACK_RANGES - numRanges)) break; // too many NACKs
while (lastNum - (*it) > 255)
{
buf[8 + numRanges*2] = 255; buf[8 + numRanges*2 + 1] = 0; // NACKs 255, Acks 0
lastNum -= 255;
numRanges++;
}
}
// NACKs and Acks ranges
buf[8 + numRanges*2] = lastNum - (*it) - 1; // NACKs buf[8 + numRanges*2] = lastNum - (*it) - 1; // NACKs
lastNum = *it; it++; lastNum = *it; it++;
uint8_t numAcks = 1; int numAcks = 1;
while (it != m_OutOfSequencePackets.rend () && numAcks < 255 && lastNum > 0 && *it == lastNum - 1) while (it != m_OutOfSequencePackets.rend () && lastNum > 0 && *it == lastNum - 1)
{ {
numAcks++; lastNum--; numAcks++; lastNum--;
it++; it++;
} }
buf[8 + numRanges*2 + 1] = numAcks; // Acks while (numAcks > 255)
{
// Acks only ranges
buf[8 + numRanges*2 + 1] = 255; // Acks 255
numAcks -= 255;
numRanges++; numRanges++;
if (numAcks == 255) break; buf[8 + numRanges*2] = 0; // NACKs 0
if (numRanges >= SSU2_MAX_NUM_ACK_RANGES) break;
} }
else if (numAcks > 255) numAcks = 255;
break; buf[8 + numRanges*2 + 1] = (uint8_t)numAcks; // Acks
numRanges++;
} }
if (numRanges < SSU2_MAX_NUM_ACK_RANGES && it == m_OutOfSequencePackets.rend ()) if (numRanges < SSU2_MAX_NUM_ACK_RANGES && it == m_OutOfSequencePackets.rend ())
{ {