From 623e59b2a22e862ef2a5702acb0de2bf96373d14 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Sun, 23 Mar 2025 22:02:30 +0700
Subject: [PATCH] ackhandler: fix qlogging of path probe timer resets and
 cancellations (#5003)

---
 internal/ackhandler/sent_packet_handler.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/internal/ackhandler/sent_packet_handler.go b/internal/ackhandler/sent_packet_handler.go
index 83d2736a..a53be7d7 100644
--- a/internal/ackhandler/sent_packet_handler.go
+++ b/internal/ackhandler/sent_packet_handler.go
@@ -584,14 +584,15 @@ func (h *sentPacketHandler) setLossDetectionTimer(now time.Time) {
 	newAlarm := h.lossDetectionTime(now)
 	h.alarm = newAlarm
 
-	if newAlarm.Time.IsZero() && !oldAlarm.Time.IsZero() {
+	hasAlarm := !newAlarm.Time.IsZero()
+	if !hasAlarm && !oldAlarm.Time.IsZero() {
 		h.logger.Debugf("Canceling loss detection timer.")
 		if h.tracer != nil && h.tracer.LossTimerCanceled != nil {
 			h.tracer.LossTimerCanceled()
 		}
 	}
 
-	if h.tracer != nil && h.tracer.SetLossTimer != nil && newAlarm != oldAlarm {
+	if hasAlarm && h.tracer != nil && h.tracer.SetLossTimer != nil && newAlarm != oldAlarm {
 		h.tracer.SetLossTimer(newAlarm.TimerType, newAlarm.EncryptionLevel, newAlarm.Time)
 	}
 }
@@ -636,7 +637,7 @@ func (h *sentPacketHandler) lossDetectionTime(now time.Time) alarmTimer {
 		return alarmTimer{
 			Time:            pathProbeLossTime,
 			TimerType:       logging.TimerTypePathProbe,
-			EncryptionLevel: encLevel,
+			EncryptionLevel: protocol.Encryption1RTT,
 		}
 	}
 	return alarmTimer{}