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

fix: MaybePackProbePacket also use QUIC spec (#34)

Browse source 
Patch MaybePackProbePacket to also generate the initial packet based on the QUIC spec if set. This fixes the incorrect behavior observed on automatic retry on timeout (sending probe packet), where uquic was inccorectly sending the default frames (PADDING, CRYPTO) instead of specified frames by QUIC spec.

Signed-off-by: Gaukas Wang <i@gaukas.wang>
This commit is contained in:
Gaukas Wang 2024-05-02 18:09:00 -07:00 • committed by GitHub
parent 164729a701
commit 9178bdb6a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 147 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

69
internal/ackhandler/u_sent_packet_handler.go
View file

@ -28,3 +28,72 @@ func SetInitialPacketNumberLength(h SentPacketHandler, pnLen protocol.PacketNumb
sph.initialPacketNumberLength = pnLen
}
}
// func (h *uSentPacketHandler) OnLossDetectionTimeout() error {
// defer h.setLossDetectionTimer()
// earliestLossTime, encLevel := h.getLossTimeAndSpace()
// if !earliestLossTime.IsZero() {
// if h.logger.Debug() {
// h.logger.Debugf("Loss detection alarm fired in loss timer mode. Loss time: %s", earliestLossTime)
// }
// if h.tracer != nil && h.tracer.LossTimerExpired != nil {
// h.tracer.LossTimerExpired(logging.TimerTypeACK, encLevel)
// }
// // Early retransmit or time loss detection
// return h.detectLostPackets(time.Now(), encLevel)
// }
// // PTO
// // When all outstanding are acknowledged, the alarm is canceled in
// // setLossDetectionTimer. This doesn't reset the timer in the session though.
// // When OnAlarm is called, we therefore need to make sure that there are
// // actually packets outstanding.
// if h.bytesInFlight == 0 && !h.peerCompletedAddressValidation {
// h.ptoCount++
// 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
// }
// _, encLevel, ok := h.getPTOTimeAndSpace()
// if !ok {
// return nil
// }
// if ps := h.getPacketNumberSpace(encLevel); !ps.history.HasOutstandingPackets() && !h.peerCompletedAddressValidation {
// return nil
// }
// h.ptoCount++
// if h.logger.Debug() {
// h.logger.Debugf("Loss detection alarm for %s fired in PTO mode. PTO count: %d", encLevel, h.ptoCount)
// }
// if h.tracer != nil {
// if h.tracer.LossTimerExpired != nil {
// h.tracer.LossTimerExpired(logging.TimerTypePTO, encLevel)
// }
// if h.tracer.UpdatedPTOCount != nil {
// h.tracer.UpdatedPTOCount(h.ptoCount)
// }
// }
// h.numProbesToSend += 2
// //nolint:exhaustive // We never arm a PTO timer for 0-RTT packets.
// switch encLevel {
// case protocol.EncryptionInitial:
// // h.ptoMode = SendPTOInitial // or quic-go will send fallback initial packets with different FRAME architecture
// case protocol.EncryptionHandshake:
// h.ptoMode = SendPTOHandshake
// case protocol.Encryption1RTT:
// // skip a packet number in order to elicit an immediate ACK
// pn := h.PopPacketNumber(protocol.Encryption1RTT)
// h.getPacketNumberSpace(protocol.Encryption1RTT).history.SkippedPacket(pn)
// h.ptoMode = SendPTOAppData
// default:
// return fmt.Errorf("PTO timer in unexpected encryption level: %s", encLevel)
// }
// return nil
// }