summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorHugo Landau <hlandau@openssl.org>2022-12-16 10:11:10 +0000
committerTomas Mraz <tomas@openssl.org>2023-01-30 09:42:29 +0100
commit8ca3baa9bdf972b963a70769780db67ebcbdf779 (patch)
tree92281078c90736f14ad068edc03a3a20ca9d0735 /ssl
parent51cf034433d528876f3c235c5150c5acfe88f24d (diff)
QUIC ACKM: Clarify probe types
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19925)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/quic/quic_ackm.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/ssl/quic/quic_ackm.c b/ssl/quic/quic_ackm.c
index 53eb51cfc8..2c01757494 100644
--- a/ssl/quic/quic_ackm.c
+++ b/ssl/quic/quic_ackm.c
@@ -1250,18 +1250,22 @@ int ossl_ackm_on_handshake_confirmed(OSSL_ACKM *ackm)
return 1;
}
-static void ackm_queue_probe_handshake(OSSL_ACKM *ackm)
+static void ackm_queue_probe_anti_deadlock_handshake(OSSL_ACKM *ackm)
{
- ++ackm->pending_probe.handshake;
+ ++ackm->pending_probe.anti_deadlock_handshake;
}
-static void ackm_queue_probe_padded_initial(OSSL_ACKM *ackm)
+static void ackm_queue_probe_anti_deadlock_initial(OSSL_ACKM *ackm)
{
- ++ackm->pending_probe.padded_initial;
+ ++ackm->pending_probe.anti_deadlock_initial;
}
static void ackm_queue_probe(OSSL_ACKM *ackm, int pkt_space)
{
+ /*
+ * TODO(QUIC): We are allowed to send either one or two probe packets here.
+ * Determine a strategy for when we should send two probe packets.
+ */
++ackm->pending_probe.pto[pkt_space];
}
@@ -1289,9 +1293,9 @@ int ossl_ackm_on_timeout(OSSL_ACKM *ackm)
* ownership.
*/
if (ackm->discarded[QUIC_PN_SPACE_INITIAL])
- ackm_queue_probe_handshake(ackm);
+ ackm_queue_probe_anti_deadlock_handshake(ackm);
else
- ackm_queue_probe_padded_initial(ackm);
+ ackm_queue_probe_anti_deadlock_initial(ackm);
} else {
/*
* PTO. The user of the ACKM should send new data if available, else