* SSL_tick() is called on time. This is not needed if the application always
* has a call blocking to SSL_read() or SSL_write() (or another I/O function) on
* a QUIC SSL object, but if the application goes for long periods of time
- * without makingany such call to a QUIC SSL object, libssl cannot ordinarily
+ * without making any such call to a QUIC SSL object, libssl cannot ordinarily
* guarantee that QUIC timeout events will be serviced in a timely fashion.
* Thread assisted mode is therefore of use to applications which do not always
* have an ongoing call to an I/O function on a QUIC SSL object but also do not
/*
* RFC 9000 s. 10.1. 'An endpoint also restarts its idle timer when
* sending an ack-eliciting packet if no other ack-eliciting packets
- * have been sentsince last receiving and processing a packet.'
+ * have been sent since last receiving and processing a packet.'
*/
if (sent_ack_eliciting && !ch->have_sent_ack_eliciting_since_rx) {
ch_update_idle(ch);
* passes it to us and is responsible for freeing it after channel
* destruction.
*/
- CRYPTO_RWLOCK *mutex;
+ CRYPTO_MUTEX *mutex;
/*
* Callback used to get the current time.
* The mutex used to synchronise access to the QUIC_CHANNEL. We own this but
* provide it to the channel.
*/
- CRYPTO_RWLOCK *mutex;
+ CRYPTO_MUTEX *mutex;
/* Our single bidirectional application data stream. */
QUIC_STREAM *stream0;
static int poll_two_fds(int rfd, int rfd_want_read,
int wfd, int wfd_want_write,
OSSL_TIME deadline,
- CRYPTO_RWLOCK *mutex)
+ CRYPTO_MUTEX *mutex)
{
#if defined(OPENSSL_SYS_WINDOWS) || !defined(POLLIN)
fd_set rfd_set, wfd_set, efd_set;
static int poll_two_descriptors(const BIO_POLL_DESCRIPTOR *r, int r_want_read,
const BIO_POLL_DESCRIPTOR *w, int w_want_write,
OSSL_TIME deadline,
- CRYPTO_RWLOCK *mutex)
+ CRYPTO_MUTEX *mutex)
{
int rfd, wfd;
int ossl_quic_reactor_block_until_pred(QUIC_REACTOR *rtor,
int (*pred)(void *arg), void *pred_arg,
uint32_t flags,
- CRYPTO_RWLOCK *mutex)
+ CRYPTO_MUTEX *mutex)
{
int res;
#include "internal/thread_arch.h"
#include "internal/quic_thread_assist.h"
-#if !defined(OPENSSL_NO_QUIC) && !defined(OPENSSL_NO_THREAD_POOL)
+#if !defined(OPENSSL_NO_QUIC) && defined(OPENSSL_THREADS)
/* Main loop for the QUIC assist thread. */
static unsigned int assist_thread_main(void *arg)
QUIC_CHANNEL *ch;
/* The mutex we give to the QUIC channel. */
- CRYPTO_RWLOCK *mutex;
+ CRYPTO_MUTEX *mutex;
/* SSL_CTX for creating the underlying TLS connection */
SSL_CTX *ctx;