mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

simplify detection of acknowledgements for skipped packets

Browse source
This commit is contained in:
Marten Seemann 2021-04-02 11:29:19 +07:00
parent 875692ea10
commit c4073fba8a
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
internal/ackhandler/sent_packet_handler.go
View file

@ -311,9 +311,6 @@ func (h *sentPacketHandler) ReceivedAck(ack *wire.AckFrame, encLevel protocol.En
return err return err
} }
for _, p := range ackedPackets { for _, p := range ackedPackets {
if p.skippedPacket {
return fmt.Errorf("received an ACK for skipped packet number: %d (%s)", p.PacketNumber, encLevel)
}
if p.includedInBytesInFlight && !p.declaredLost { if p.includedInBytesInFlight && !p.declaredLost {
h.congestion.OnPacketAcked(p.PacketNumber, p.Length, priorInFlight, rcvTime) h.congestion.OnPacketAcked(p.PacketNumber, p.Length, priorInFlight, rcvTime)
} }
@ -367,15 +364,17 @@ func (h *sentPacketHandler) detectAndRemoveAckedPackets(ack *wire.AckFrame, encL
ackRange = ack.AckRanges[len(ack.AckRanges)-1-ackRangeIndex] ackRange = ack.AckRanges[len(ack.AckRanges)-1-ackRangeIndex]
} }
if p.PacketNumber >= ackRange.Smallest { // packet i contained in ACK range if p.PacketNumber < ackRange.Smallest { // packet not contained in ACK range
if p.PacketNumber > ackRange.Largest { return true, nil
return false, fmt.Errorf("BUG: ackhandler would have acked wrong packet %d, while evaluating range %d -> %d", p.PacketNumber, ackRange.Smallest, ackRange.Largest) }
} if p.PacketNumber > ackRange.Largest {
h.ackedPackets = append(h.ackedPackets, p) return false, fmt.Errorf("BUG: ackhandler would have acked wrong packet %d, while evaluating range %d -> %d", p.PacketNumber, ackRange.Smallest, ackRange.Largest)
} }
} else {
h.ackedPackets = append(h.ackedPackets, p)
} }
if p.skippedPacket {
return false, fmt.Errorf("received an ACK for skipped packet number: %d (%s)", p.PacketNumber, encLevel)
}
h.ackedPackets = append(h.ackedPackets, p)
return true, nil return true, nil
}) })
if h.logger.Debug() && len(h.ackedPackets) > 0 { if h.logger.Debug() && len(h.ackedPackets) > 0 {
@ -399,7 +398,7 @@ func (h *sentPacketHandler) detectAndRemoveAckedPackets(ack *wire.AckFrame, encL
if err := pnSpace.history.Remove(p.PacketNumber); err != nil { if err := pnSpace.history.Remove(p.PacketNumber); err != nil {
return nil, err return nil, err
} }
if h.tracer != nil && !p.skippedPacket { if h.tracer != nil {
h.tracer.AcknowledgedPacket(encLevel, p.PacketNumber) h.tracer.AcknowledgedPacket(encLevel, p.PacketNumber)
} }
} }