Skip to content

Commit

Permalink
QUIC TXP: Do not generate full-size packets when sending CC-excess pr…
Browse files Browse the repository at this point in the history 
…obes

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from #21349)
  • Loading branch information
@hlandau @paulidale
hlandau authored and paulidale committed Jul 19, 2023
1 parent 76908b4 commit d56b564
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 15 deletions.
8 changes: 4 additions & 4 deletions include/internal/quic_txp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ typedef void (ossl_quic_initial_token_free_fn)(const unsigned char *buf,
void ossl_quic_tx_packetiser_free(OSSL_QUIC_TX_PACKETISER *txp);

/* Generate normal packets containing most frame types. */
#define TX_PACKETISER_ARCHETYPE_NORMAL 0
/* Generate ACKs only. */
#define TX_PACKETISER_ARCHETYPE_ACK_ONLY 1
#define TX_PACKETISER_ARCHETYPE_NUM 2
#define TX_PACKETISER_ARCHETYPE_NORMAL 0
/* Generate ACKs and PINGs only. */
#define TX_PACKETISER_ARCHETYPE_ACK_AND_PING_ONLY 1
#define TX_PACKETISER_ARCHETYPE_NUM 2

/*
* Generates a datagram by polling the various ELs to determine if they want to
Expand Down
25 changes: 14 additions & 11 deletions ssl/quic/quic_txp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,10 +661,10 @@ static const struct archetype_data archetypes[QUIC_ENC_LEVEL_NUM][TX_PACKETISER_
/*allow_new_token =*/ 0,
/*allow_force_ack_eliciting =*/ 1,
},
/* EL 0(INITIAL) - Archetype 1(ACK_ONLY) */
/* EL 0(INITIAL) - Archetype 1(ACK_AND_PING_ONLY) */
{
/*allow_ack =*/ 1,
/*allow_ping =*/ 0,
/*allow_ping =*/ 1,
/*allow_crypto =*/ 0,
/*allow_handshake_done =*/ 0,
/*allow_path_challenge =*/ 0,
Expand Down Expand Up @@ -698,10 +698,10 @@ static const struct archetype_data archetypes[QUIC_ENC_LEVEL_NUM][TX_PACKETISER_
/*allow_new_token =*/ 0,
/*allow_force_ack_eliciting =*/ 1,
},
/* EL 1(HANDSHAKE) - Archetype 1(ACK_ONLY) */
/* EL 1(HANDSHAKE) - Archetype 1(ACK_AND_PING_ONLY) */
{
/*allow_ack =*/ 1,
/*allow_ping =*/ 0,
/*allow_ping =*/ 1,
/*allow_crypto =*/ 0,
/*allow_handshake_done =*/ 0,
/*allow_path_challenge =*/ 0,
Expand Down Expand Up @@ -735,10 +735,10 @@ static const struct archetype_data archetypes[QUIC_ENC_LEVEL_NUM][TX_PACKETISER_
/*allow_new_token =*/ 0,
/*allow_force_ack_eliciting =*/ 0,
},
/* EL 2(0RTT) - Archetype 1(ACK_ONLY) */
/* EL 2(0RTT) - Archetype 1(ACK_AND_PING_ONLY) */
{
/*allow_ack =*/ 0,
/*allow_ping =*/ 0,
/*allow_ping =*/ 1,
/*allow_crypto =*/ 0,
/*allow_handshake_done =*/ 0,
/*allow_path_challenge =*/ 0,
Expand Down Expand Up @@ -772,10 +772,10 @@ static const struct archetype_data archetypes[QUIC_ENC_LEVEL_NUM][TX_PACKETISER_
/*allow_new_token =*/ 1,
/*allow_force_ack_eliciting =*/ 1,
},
/* EL 3(1RTT) - Archetype 1(ACK_ONLY) */
/* EL 3(1RTT) - Archetype 1(ACK_AND_PING_ONLY) */
{
/*allow_ack =*/ 1,
/*allow_ping =*/ 0,
/*allow_ping =*/ 1,
/*allow_crypto =*/ 0,
/*allow_handshake_done =*/ 0,
/*allow_path_challenge =*/ 0,
Expand Down Expand Up @@ -999,10 +999,13 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp, uint32_t enc_level,
/* Determine the limit CC imposes on what we can send. */
if (!cc_can_send) {
/*
* If we are called when we cannot send, this must be because we want
* to generate a probe. In this circumstance, don't clamp based on CC.
* If we are called when we cannot send, this must be because we want to
* generate a probe. In this circumstance, don't clamp based on CC, but
* don't add application data and limit ourselves to generating a small
* packet containing only PING and ACK frames.
*/
cc_limit = SIZE_MAX;
cc_limit = SIZE_MAX;
archetype = TX_PACKETISER_ARCHETYPE_ACK_AND_PING_ONLY;
} else {
/* Allow CC to clamp how much we can send. */
cc_limit_ = txp->args.cc_method->get_tx_allowance(txp->args.cc_data);
Expand Down

0 comments on commit d56b564

Please sign in to comment.