upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-21 06:06:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

MINOR: quic: Add max_idle_timeout advertisement handling

Browse source 
When we store the remote transport parameters, we compute the maximum idle
timeout for the connection which is the minimum of the two advertised
max_idle_timeout transport parameter values if both have non-null values, or the
maximum if one of the value is set and non-null.
This commit is contained in:
Frédéric Lécaille 2022-03-08 14:08:16 +01:00 committed by Amaury Denoyelle
parent d2985f3cec
commit 66d37fa051
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/haproxy/xprt_quic-t.h
View file

@ -742,6 +742,7 @@ struct quic_conn {
struct quic_tls_kp nxt_tx;
} ku;
unsigned int max_ack_delay;
unsigned int max_idle_timeout;
struct quic_path paths[1];
struct quic_path *path;

19
include/haproxy/xprt_quic.h
View file

@ -942,17 +942,30 @@ static inline int quic_transport_params_decode(struct quic_transport_params *p,
/* Store transport parameters found in <buf> buffer into <conn> QUIC connection
* depending on <server> value which must be 1 for a server (haproxy listener)
* or 0 for a client (connection to a haproxy server).
* Note that peer transport parameters are stored in the TX part of the connection:
* they are used to send packets to the peer with its transport parameters as
* limitations.
* Returns 1 if succeeded, 0 if not.
*/
static inline int quic_transport_params_store(struct quic_conn *conn, int server,
const unsigned char *buf,
const unsigned char *end)
{
if (!quic_transport_params_decode(&conn->tx.params, server, buf, end))
struct quic_transport_params *tx_params = &conn->tx.params;
struct quic_transport_params *rx_params = &conn->rx.params;
if (!quic_transport_params_decode(tx_params, server, buf, end))
return 0;
if (conn->tx.params.max_ack_delay)
conn->max_ack_delay = conn->tx.params.max_ack_delay;
if (tx_params->max_ack_delay)
conn->max_ack_delay = tx_params->max_ack_delay;
if (tx_params->max_idle_timeout && rx_params->max_idle_timeout)
conn->max_idle_timeout =
QUIC_MIN(tx_params->max_idle_timeout, rx_params->max_idle_timeout);
else
conn->max_idle_timeout =
QUIC_MAX(tx_params->max_idle_timeout, rx_params->max_idle_timeout);
return 1;
}