From 3e5287803972de26d0ccbb912bf26e4fd42e39e1 Mon Sep 17 00:00:00 2001 From: Hugo Landau Date: Fri, 8 Sep 2023 13:30:56 +0100 Subject: QLOG: Wiring: QUIC FIFD Reviewed-by: Matt Caswell Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/22037) --- include/internal/quic_fifd.h | 5 ++++- include/internal/quic_txp.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/internal/quic_fifd.h b/include/internal/quic_fifd.h index a260ec4471..1271bd5bc4 100644 --- a/include/internal/quic_fifd.h +++ b/include/internal/quic_fifd.h @@ -16,6 +16,7 @@ # include "internal/quic_ackm.h" # include "internal/quic_txpim.h" # include "internal/quic_stream.h" +# include "internal/qlog.h" # ifndef OPENSSL_NO_QUIC @@ -45,6 +46,7 @@ struct quic_fifd_st { void (*sstream_updated)(uint64_t stream_id, void *arg); void *sstream_updated_arg; + QLOG *qlog; }; int ossl_quic_fifd_init(QUIC_FIFD *fifd, @@ -69,7 +71,8 @@ int ossl_quic_fifd_init(QUIC_FIFD *fifd, void *confirm_frame_arg, void (*sstream_updated)(uint64_t stream_id, void *arg), - void *sstream_updated_arg); + void *sstream_updated_arg, + QLOG *qlog); void ossl_quic_fifd_cleanup(QUIC_FIFD *fifd); /* (no-op) */ diff --git a/include/internal/quic_txp.h b/include/internal/quic_txp.h index 7c00c41419..6f1debb1d9 100644 --- a/include/internal/quic_txp.h +++ b/include/internal/quic_txp.h @@ -21,6 +21,7 @@ # include "internal/quic_fc.h" # include "internal/bio_addr.h" # include "internal/time.h" +# include "internal/qlog.h" # ifndef OPENSSL_NO_QUIC @@ -49,6 +50,7 @@ typedef struct ossl_quic_tx_packetiser_args_st { OSSL_CC_DATA *cc_data; /* QUIC Congestion Controller Instance */ OSSL_TIME (*now)(void *arg); /* Callback to get current time. */ void *now_arg; + QLOG *qlog; /* Optional QLOG instance */ /* * Injected dependencies - crypto streams. -- cgit v1.2.3