QUIC CHANNEL, TSERVER: Move to using libctx/propq/mutex/now_cb via QUIC_PORT

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)

2 files changed, 4 insertions, 22 deletions

diff --git a/include/internal/quic_channel.h b/include/internal/quic_channel.h
index f4bee6bf46..9a434fbb7f 100644
--- a/include/internal/quic_channel.h
+++ b/include/internal/quic_channel.h
@@ -112,30 +112,8 @@ typedef struct quic_channel_args_st {
      */
     QUIC_PORT       *port;
 
-    OSSL_LIB_CTX    *libctx;
-    const char      *propq;
     int             is_server;
     SSL             *tls;
-
-    /*
-     * This must be a mutex the lifetime of which will exceed that of the
-     * channel. The instantiator of the channel is responsible for providing a
-     * mutex as this makes it easier to handle instantiation and teardown of
-     * channels in situations potentially requiring locking.
-     *
-     * Note that this is a MUTEX not a RWLOCK as it needs to be an OS mutex for
-     * compatibility with an OS's condition variable wait API, whereas RWLOCK
-     * may, depending on the build configuration, be implemented using an OS's
-     * mutex primitive or using its RW mutex primitive.
-     */
-    CRYPTO_MUTEX    *mutex;
-
-    /*
-     * Optional function pointer to use to retrieve the current time. If NULL,
-     * ossl_time_now() is used.
-     */
-    OSSL_TIME       (*now_cb)(void *arg);
-    void            *now_cb_arg;
 } QUIC_CHANNEL_ARGS;
 
 typedef struct quic_channel_st QUIC_CHANNEL;
diff --git a/include/internal/quic_port.h b/include/internal/quic_port.h
index f8d774c153..a42d2138f5 100644
--- a/include/internal/quic_port.h
+++ b/include/internal/quic_port.h
@@ -44,6 +44,10 @@ typedef struct quic_port_args_st {
      */
     CRYPTO_MUTEX    *mutex;
 
+    /*
+     * Optional function pointer to use to retrieve the current time. If NULL,
+     * ossl_time_now() is used.
+     */
     OSSL_TIME       (*now_cb)(void *arg);
     void            *now_cb_arg;
 } QUIC_PORT_ARGS;