summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHugo Landau <hlandau@openssl.org>2023-07-13 11:22:14 +0100
committerTomas Mraz <tomas@openssl.org>2023-07-21 08:43:52 +0200
commitfaebafda9fa232dc84fee2bbf16d478425703490 (patch)
tree5ae685a0d4b5552f08653fb03c12c4a61cb2bea5 /include
parent41d39984e948322700a9b48ed6c6e8426bed3a9d (diff)
QUIC TXP: Major refactor to handle padding correctly
Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21458)
Diffstat (limited to 'include')
-rw-r--r--include/internal/quic_txp.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/include/internal/quic_txp.h b/include/internal/quic_txp.h
index ed11f09fa0..c5a4c44a52 100644
--- a/include/internal/quic_txp.h
+++ b/include/internal/quic_txp.h
@@ -67,19 +67,11 @@ 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 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
* generate any frames, and generating a datagram which coalesces packets for
* any ELs which do.
*
- * archetype is a TX_PACKETISER_ARCHETYPE_* value.
- *
* Returns TX_PACKETISER_RES_FAILURE on failure (e.g. allocation error),
* TX_PACKETISER_RES_NO_PKT if no packets were sent (e.g. because nothing wants
* to send anything), and TX_PACKETISER_RES_SENT_PKT if packets were sent.
@@ -96,23 +88,9 @@ typedef struct quic_txp_status_st {
} QUIC_TXP_STATUS;
int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
- uint32_t archetype,
QUIC_TXP_STATUS *status);
/*
- * Returns 1 if one or more packets would be generated if
- * ossl_quic_tx_packetiser_generate were called.
- *
- * If TX_PACKETISER_BYPASS_CC is set in flags, congestion control is
- * ignored for the purposes of making this determination.
- */
-#define TX_PACKETISER_BYPASS_CC (1U << 0)
-
-int ossl_quic_tx_packetiser_has_pending(OSSL_QUIC_TX_PACKETISER *txp,
- uint32_t archetype,
- uint32_t flags);
-
-/*
* Set the token used in Initial packets. The callback is called when the buffer
* is no longer needed; for example, when the TXP is freed or when this function
* is called again with a new buffer.