mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-19 16:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't keep creating CONNECTION_CLOSE frames

Browse Source 
If we want to send a CONNECTION_CLOSE frame then one is enough unless we
are scheduled to send another one. Now that we can create more than one
datagram in one go this is now required.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21798)
This commit is contained in:
Matt Caswell 2023-08-18 11:55:50 +01:00 committed by Tomas Mraz
parent aa433014bb
commit 0b31072e08
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/internal/quic_txpim.h
View File

@ -40,6 +40,7 @@ typedef struct quic_txpim_pkt_st {
unsigned int had_max_streams_bidi_frame : 1;
unsigned int had_max_streams_uni_frame : 1;
unsigned int had_ack_frame : 1;
unsigned int had_conn_close : 1;
/* Private data follows. */
} QUIC_TXPIM_PKT;

4
ssl/quic/quic_txp.c
View File

@ -1804,6 +1804,7 @@ static int txp_generate_pre_token(OSSL_QUIC_TX_PACKETISER *txp,
if (!tx_helper_commit(h))
return 0;
tpkt->had_conn_close = 1;
*can_be_non_inflight = 0;
} else {
tx_helper_rollback(h);
@ -2944,6 +2945,9 @@ static int txp_pkt_commit(OSSL_QUIC_TX_PACKETISER *txp,
if (tpkt->had_ack_frame)
txp->want_ack &= ~(1UL << pn_space);
if (tpkt->had_conn_close)
txp->want_conn_close = 0;
/*
* Decrement probe request counts if we have sent a packet that meets
* the requirement of a probe, namely being ACK-eliciting.

1
ssl/quic/quic_txpim.c
View File

@ -115,6 +115,7 @@ static void txpim_clear(QUIC_TXPIM_PKT_EX *ex)
ex->public.had_max_streams_bidi_frame = 0;
ex->public.had_max_streams_uni_frame = 0;
ex->public.had_ack_frame = 0;
ex->public.had_conn_close = 0;
}
QUIC_TXPIM_PKT *ossl_quic_txpim_pkt_alloc(QUIC_TXPIM *txpim)