gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

rename lastSentAckElicitingPacketTime to lastAckElicitingPacketTime

Browse Source
This commit is contained in:
Marten Seemann
2020-05-27 10:38:51 +07:00
parent c8e5bb5b50
commit feb3e9a713
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/ackhandler/sent_packet_handler.go
View File

@@ -28,8 +28,8 @@ type packetNumberSpace struct {
history *sentPacketHistory history *sentPacketHistory
pns *packetNumberGenerator pns *packetNumberGenerator
lossTime time.Time lossTime time.Time
lastSentAckElicitingPacketTime time.Time lastAckElicitingPacketTime time.Time
largestAcked protocol.PacketNumber largestAcked protocol.PacketNumber
largestSent protocol.PacketNumber largestSent protocol.PacketNumber
@@ -244,7 +244,7 @@ func (h *sentPacketHandler) sentPacketImpl(packet *Packet) bool /* is ack-elicit
isAckEliciting := len(packet.Frames) > 0 isAckEliciting := len(packet.Frames) > 0
if isAckEliciting { if isAckEliciting {
pnSpace.lastSentAckElicitingPacketTime = packet.SendTime pnSpace.lastAckElicitingPacketTime = packet.SendTime
packet.includedInBytesInFlight = true packet.includedInBytesInFlight = true
h.bytesInFlight += packet.Length h.bytesInFlight += packet.Length
if h.numProbesToSend > 0 { if h.numProbesToSend > 0 {
@@ -419,22 +419,22 @@ func (h *sentPacketHandler) getEarliestLossTimeAndSpace() (time.Time, protocol.E
return lossTime, encLevel return lossTime, encLevel
} }
// same logic as getEarliestLossTimeAndSpace, but for lastSentAckElicitingPacketTime instead of lossTime // same logic as getEarliestLossTimeAndSpace, but for lastAckElicitingPacketTime instead of lossTime
func (h *sentPacketHandler) getEarliestSentTimeAndSpace() (time.Time, protocol.EncryptionLevel) { func (h *sentPacketHandler) getEarliestSentTimeAndSpace() (time.Time, protocol.EncryptionLevel) {
var encLevel protocol.EncryptionLevel var encLevel protocol.EncryptionLevel
var sentTime time.Time var sentTime time.Time
if h.initialPackets != nil { if h.initialPackets != nil {
sentTime = h.initialPackets.lastSentAckElicitingPacketTime sentTime = h.initialPackets.lastAckElicitingPacketTime
encLevel = protocol.EncryptionInitial encLevel = protocol.EncryptionInitial
} }
if h.handshakePackets != nil && (sentTime.IsZero() || (!h.handshakePackets.lastSentAckElicitingPacketTime.IsZero() && h.handshakePackets.lastSentAckElicitingPacketTime.Before(sentTime))) { if h.handshakePackets != nil && (sentTime.IsZero() || (!h.handshakePackets.lastAckElicitingPacketTime.IsZero() && h.handshakePackets.lastAckElicitingPacketTime.Before(sentTime))) {
sentTime = h.handshakePackets.lastSentAckElicitingPacketTime sentTime = h.handshakePackets.lastAckElicitingPacketTime
encLevel = protocol.EncryptionHandshake encLevel = protocol.EncryptionHandshake
} }
if h.handshakeComplete && if h.handshakeComplete &&
(sentTime.IsZero() || (!h.appDataPackets.lastSentAckElicitingPacketTime.IsZero() && h.appDataPackets.lastSentAckElicitingPacketTime.Before(sentTime))) { (sentTime.IsZero() || (!h.appDataPackets.lastAckElicitingPacketTime.IsZero() && h.appDataPackets.lastAckElicitingPacketTime.Before(sentTime))) {
sentTime = h.appDataPackets.lastSentAckElicitingPacketTime sentTime = h.appDataPackets.lastAckElicitingPacketTime
encLevel = protocol.Encryption1RTT encLevel = protocol.Encryption1RTT
} }
return sentTime, encLevel return sentTime, encLevel

6
internal/ackhandler/sent_packet_handler_test.go
View File

@@ -125,20 +125,20 @@ var _ = Describe("SentPacketHandler", func() {
It("stores the sent time", func() { It("stores the sent time", func() {
sendTime := time.Now().Add(-time.Minute) sendTime := time.Now().Add(-time.Minute)
handler.SentPacket(ackElicitingPacket(&Packet{PacketNumber: 1, SendTime: sendTime})) handler.SentPacket(ackElicitingPacket(&Packet{PacketNumber: 1, SendTime: sendTime}))
Expect(handler.appDataPackets.lastSentAckElicitingPacketTime).To(Equal(sendTime)) Expect(handler.appDataPackets.lastAckElicitingPacketTime).To(Equal(sendTime))
}) })
It("stores the sent time of Initial packets", func() { It("stores the sent time of Initial packets", func() {
sendTime := time.Now().Add(-time.Minute) sendTime := time.Now().Add(-time.Minute)
handler.SentPacket(ackElicitingPacket(&Packet{PacketNumber: 1, SendTime: sendTime, EncryptionLevel: protocol.EncryptionInitial})) handler.SentPacket(ackElicitingPacket(&Packet{PacketNumber: 1, SendTime: sendTime, EncryptionLevel: protocol.EncryptionInitial}))
handler.SentPacket(ackElicitingPacket(&Packet{PacketNumber: 2, SendTime: sendTime.Add(time.Hour), EncryptionLevel: protocol.Encryption1RTT})) handler.SentPacket(ackElicitingPacket(&Packet{PacketNumber: 2, SendTime: sendTime.Add(time.Hour), EncryptionLevel: protocol.Encryption1RTT}))
Expect(handler.initialPackets.lastSentAckElicitingPacketTime).To(Equal(sendTime)) Expect(handler.initialPackets.lastAckElicitingPacketTime).To(Equal(sendTime))
}) })
It("does not store non-ack-eliciting packets", func() { It("does not store non-ack-eliciting packets", func() {
handler.SentPacket(nonAckElicitingPacket(&Packet{PacketNumber: 1})) handler.SentPacket(nonAckElicitingPacket(&Packet{PacketNumber: 1}))
Expect(handler.appDataPackets.history.Len()).To(BeZero()) Expect(handler.appDataPackets.history.Len()).To(BeZero())
Expect(handler.appDataPackets.lastSentAckElicitingPacketTime).To(BeZero()) Expect(handler.appDataPackets.lastAckElicitingPacketTime).To(BeZero())
Expect(handler.bytesInFlight).To(BeZero()) Expect(handler.bytesInFlight).To(BeZero())
}) })
}) })