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

add an OnAcked callback to ackhandler.Frames

Browse source
This commit is contained in:
Marten Seemann 2019-08-30 13:31:20 +07:00
parent 0edb3f2b93
commit 3525a51ada
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
internal/ackhandler/frame.go
View file

@ -5,4 +5,5 @@ import "github.com/lucas-clemente/quic-go/internal/wire"
type Frame struct {
wire.Frame // nil if the frame has already been acknowledged in another packet
OnLost func(wire.Frame)
OnAcked func()
}

5
internal/ackhandler/sent_packet_handler.go
View file

@ -444,6 +444,11 @@ func (h *sentPacketHandler) onPacketAcked(p *Packet, rcvTime time.Time) error {
return nil
}
for _, f := range p.Frames {
if f.OnAcked != nil {
f.OnAcked()
}
}
if p.includedInBytesInFlight {
h.bytesInFlight -= p.Length
}

17
internal/ackhandler/sent_packet_handler_test.go
View file

@ -48,8 +48,10 @@ var _ = Describe("SentPacketHandler", func() {
if p.SendTime.IsZero() {
p.SendTime = time.Now()
}
p.Frames = []Frame{
{Frame: &wire.PingFrame{}, OnLost: func(wire.Frame) { lostPackets = append(lostPackets, p.PacketNumber) }},
if len(p.Frames) == 0 {
p.Frames = []Frame{
{Frame: &wire.PingFrame{}, OnLost: func(wire.Frame) { lostPackets = append(lostPackets, p.PacketNumber) }},
}
}
return p
}
@ -198,6 +200,17 @@ var _ = Describe("SentPacketHandler", func() {
expectInPacketHistoryOrLost([]protocol.PacketNumber{1, 2, 3, 4, 5, 6, 7, 8, 9}, protocol.Encryption1RTT)
})
It("calls the OnAcked callback", func() {
var acked bool
handler.SentPacket(ackElicitingPacket(&Packet{
PacketNumber: 13,
Frames: []Frame{{Frame: &wire.PingFrame{}, OnAcked: func() { acked = true }}},
}))
ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 13, Largest: 13}}}
Expect(handler.ReceivedAck(ack, 1, protocol.Encryption1RTT, time.Now())).To(Succeed())
Expect(acked).To(BeTrue())
})
It("handles an ACK frame with one missing packet range", func() {
ack := &wire.AckFrame{ // lose 4 and 5
AckRanges: []wire.AckRange{