diff options
author | Hugo Landau <hlandau@openssl.org> | 2023-05-03 19:01:12 +0100 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2023-05-29 08:51:12 +0200 |
commit | 6084e04b25378a4590798a034633e90791cf74a3 (patch) | |
tree | a79d4cc002245341a7fc1f0654e879f34568afd6 /ssl | |
parent | f8503ede86115b67e1552cf332d53fe43f0cb5bd (diff) |
QUIC: Rename SSL_tick, SSL_get_tick_timeout
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20879)
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/quic/quic_impl.c | 18 | ||||
-rw-r--r-- | ssl/quic/quic_reactor.c | 5 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 8 |
3 files changed, 16 insertions, 15 deletions
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index 4ba87a32af..3297c93d58 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -820,8 +820,8 @@ int ossl_quic_conn_set_initial_peer_addr(SSL *s, * QUIC Front-End I/O API: Asynchronous I/O Management * =================================================== * - * (BIO/)SSL_tick => ossl_quic_tick - * (BIO/)SSL_get_tick_timeout => ossl_quic_get_tick_timeout + * (BIO/)SSL_handle_events => ossl_quic_handle_events + * (BIO/)SSL_get_event_timeout => ossl_quic_get_event_timeout * (BIO/)SSL_get_poll_fd => ossl_quic_get_poll_fd * */ @@ -839,9 +839,9 @@ static int xso_blocking_mode(const QUIC_XSO *xso) && xso->conn->can_poll_net_wbio; } -/* SSL_tick; ticks the reactor. */ +/* SSL_handle_events; handles events by ticking the reactor. */ QUIC_TAKES_LOCK -int ossl_quic_tick(SSL *s) +int ossl_quic_handle_events(SSL *s) { QCTX ctx; @@ -855,13 +855,13 @@ int ossl_quic_tick(SSL *s) } /* - * SSL_get_tick_timeout. Get the time in milliseconds until the SSL object - * should be ticked by the application by calling SSL_tick(). tv is set to 0 if - * the object should be ticked immediately and tv->tv_sec is set to -1 if no - * timeout is currently active. + * SSL_get_event_timeout. Get the time in milliseconds until the SSL object + * should be ticked by the application by calling SSL_handle_events(). tv is set + * to 0 if the object should be ticked immediately and tv->tv_sec is set to -1 + * if no timeout is currently active. */ QUIC_TAKES_LOCK -int ossl_quic_get_tick_timeout(SSL *s, struct timeval *tv) +int ossl_quic_get_event_timeout(SSL *s, struct timeval *tv) { QCTX ctx; OSSL_TIME deadline = ossl_time_infinite(); diff --git a/ssl/quic/quic_reactor.c b/ssl/quic/quic_reactor.c index 4d65a408bb..ef447b78c3 100644 --- a/ssl/quic/quic_reactor.c +++ b/ssl/quic/quic_reactor.c @@ -347,8 +347,9 @@ int ossl_quic_reactor_block_until_pred(QUIC_REACTOR *rtor, * the poll call. However this might be difficult because it * requires we do the call to poll(2) or equivalent syscall * ourselves, whereas in the general case the application does the - * polling and just calls SSL_tick(). Implementing this optimisation - * in the future will probably therefore require API changes. + * polling and just calls SSL_handle_events(). Implementing this + * optimisation in the future will probably therefore require API + * changes. */ return 0; } diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 3bd9e8b48c..a29cb3e2c5 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -7124,13 +7124,13 @@ int SSL_CTX_set0_tmp_dh_pkey(SSL_CTX *ctx, EVP_PKEY *dhpkey) } /* QUIC-specific methods which are supported on QUIC connections only. */ -int SSL_tick(SSL *s) +int SSL_handle_events(SSL *s) { SSL_CONNECTION *sc; #ifndef OPENSSL_NO_QUIC if (IS_QUIC(s)) - return ossl_quic_tick(s); + return ossl_quic_handle_events(s); #endif sc = SSL_CONNECTION_FROM_SSL_ONLY(s); @@ -7148,13 +7148,13 @@ int SSL_tick(SSL *s) return 1; } -int SSL_get_tick_timeout(SSL *s, struct timeval *tv) +int SSL_get_event_timeout(SSL *s, struct timeval *tv) { SSL_CONNECTION *sc; #ifndef OPENSSL_NO_QUIC if (IS_QUIC(s)) - return ossl_quic_get_tick_timeout(s, tv); + return ossl_quic_get_event_timeout(s, tv); #endif sc = SSL_CONNECTION_FROM_SSL_ONLY(s); |