mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

QUIC Thread Assisted Mode: Fix typos and use of CRYPTO_RWLOCK type

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20348)
This commit is contained in:
Hugo Landau 2023-02-23 05:02:29 +00:00
parent 1dd04a0fe2
commit c4208a6a98
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/quic_thread_assist.h
View File

@ -30,7 +30,7 @@
* 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

2
ssl/quic/quic_channel.c
View File

@ -1609,7 +1609,7 @@ static int ch_tx(QUIC_CHANNEL *ch)
/*
* 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);

2
ssl/quic/quic_channel_local.h
View File

@ -31,7 +31,7 @@ struct quic_channel_st {
* 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.

2
ssl/quic/quic_local.h
View File

@ -55,7 +55,7 @@ struct quic_conn_st {
* 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;

6
ssl/quic/quic_reactor.c
View File

@ -133,7 +133,7 @@ int ossl_quic_reactor_tick(QUIC_REACTOR *rtor, uint32_t flags)
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;
@ -282,7 +282,7 @@ static int poll_descriptor_to_fd(const BIO_POLL_DESCRIPTOR *d, int *fd)
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;
@ -307,7 +307,7 @@ static int poll_two_descriptors(const BIO_POLL_DESCRIPTOR *r, int r_want_read,
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;

2
ssl/quic/quic_thread_assist.c
View File

@ -14,7 +14,7 @@
#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)

2
ssl/quic/quic_tserver.c
View File

@ -25,7 +25,7 @@ struct quic_tserver_st {
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;