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

only send a single packet to unblock the server during the handshake

Browse source
This commit is contained in:
Marten Seemann 2020-06-01 12:39:36 +07:00
parent d137e7672d
commit dda9c27d07
2 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

51
internal/ackhandler/sent_packet_handler.go
View file

@ -1,6 +1,7 @@
package ackhandler package ackhandler
import ( import (
"errors"
"fmt" "fmt"
"math" "math"
"time" "time"
@ -617,25 +618,39 @@ func (h *sentPacketHandler) onVerifiedLossDetectionTimeout() error {
} }
// PTO // PTO
_, encLevel = h.getPTOTimeAndSpace()
if h.logger.Debug() {
h.logger.Debugf("Loss detection alarm for %s fired in PTO mode. PTO count: %d", encLevel, h.ptoCount)
}
h.ptoCount++ h.ptoCount++
if h.qlogger != nil { if h.bytesInFlight > 0 {
h.qlogger.LossTimerExpired(qlog.TimerTypePTO, encLevel) _, encLevel = h.getPTOTimeAndSpace()
h.qlogger.UpdatedPTOCount(h.ptoCount) if h.logger.Debug() {
} h.logger.Debugf("Loss detection alarm for %s fired in PTO mode. PTO count: %d", encLevel, h.ptoCount)
h.numProbesToSend += 2 }
switch encLevel { if h.qlogger != nil {
case protocol.EncryptionInitial: h.qlogger.LossTimerExpired(qlog.TimerTypePTO, encLevel)
h.ptoMode = SendPTOInitial h.qlogger.UpdatedPTOCount(h.ptoCount)
case protocol.EncryptionHandshake: }
h.ptoMode = SendPTOHandshake h.numProbesToSend += 2
case protocol.Encryption1RTT: switch encLevel {
h.ptoMode = SendPTOAppData case protocol.EncryptionInitial:
default: h.ptoMode = SendPTOInitial
return fmt.Errorf("TPO timer in unexpected encryption level: %s", encLevel) case protocol.EncryptionHandshake:
h.ptoMode = SendPTOHandshake
case protocol.Encryption1RTT:
h.ptoMode = SendPTOAppData
default:
return fmt.Errorf("TPO timer in unexpected encryption level: %s", encLevel)
}
} else {
if h.perspective == protocol.PerspectiveServer {
return errors.New("sentPacketHandler BUG: PTO fired, but bytes_in_flight is 0")
}
h.numProbesToSend++
if h.initialPackets != nil {
h.ptoMode = SendPTOInitial
} else if h.handshakePackets != nil {
h.ptoMode = SendPTOHandshake
} else {
return errors.New("sentPacketHandler BUG: PTO fired, but bytes_in_flight is 0 and Initial and Handshake already dropped")
}
} }
return nil return nil
} }

6
internal/ackhandler/sent_packet_handler_test.go
View file

@ -813,6 +813,10 @@ var _ = Describe("SentPacketHandler", func() {
Expect(handler.OnLossDetectionTimeout()).To(Succeed()) Expect(handler.OnLossDetectionTimeout()).To(Succeed())
Expect(handler.SendMode()).To(Equal(SendPTOInitial)) Expect(handler.SendMode()).To(Equal(SendPTOInitial))
// send a single packet to unblock the server
handler.SentPacket(initialPacket(&Packet{PacketNumber: 2}))
Expect(handler.SendMode()).To(Equal(SendAny))
// Now receive an ACK for a Handshake packet. // Now receive an ACK for a Handshake packet.
// This tells the client that the server completed address validation. // This tells the client that the server completed address validation.
handler.SentPacket(handshakePacket(&Packet{PacketNumber: 1})) handler.SentPacket(handshakePacket(&Packet{PacketNumber: 1}))
@ -825,7 +829,7 @@ var _ = Describe("SentPacketHandler", func() {
Expect(handler.GetLossDetectionTimeout()).To(BeZero()) Expect(handler.GetLossDetectionTimeout()).To(BeZero())
}) })
It("sends an Handshake packet to unblock the server, if Initial keys were already dropped", func() { It("sends a Handshake packet to unblock the server, if Initial keys were already dropped", func() {
handler.SentPacket(initialPacket(&Packet{PacketNumber: 1})) handler.SentPacket(initialPacket(&Packet{PacketNumber: 1}))
Expect(handler.ReceivedAck( Expect(handler.ReceivedAck(
&wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}}}, &wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}}},