mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-06 20:20:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

QUIC: Implement SSL_has_pending

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20061)
This commit is contained in:
Hugo Landau 2023-01-16 15:24:17 +00:00 committed by Pauli
parent 9ea0e72992
commit 9280d26a3a
7 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/internal/quic_channel.h
View File

@ -340,6 +340,7 @@ uint64_t ossl_quic_channel_get_rx_key_epoch(QUIC_CHANNEL *ch);
/* Artificially trigger a spontaneous TXKU if possible. */
int ossl_quic_channel_trigger_txku(QUIC_CHANNEL *ch);
int ossl_quic_channel_has_pending(const QUIC_CHANNEL *ch);
# endif

5
include/internal/quic_demux.h
View File

@ -333,6 +333,11 @@ int ossl_quic_demux_inject(QUIC_DEMUX *demux,
const BIO_ADDR *peer,
const BIO_ADDR *local);
/*
* Returns 1 if there are any pending URXEs.
*/
int ossl_quic_demux_has_pending(const QUIC_DEMUX *demux);
# endif
#endif

4
include/internal/quic_ssl.h
View File

@ -117,6 +117,10 @@ void ossl_quic_conn_force_assist_thread_wake(SSL *s);
/* For use by tests only. */
QUIC_CHANNEL *ossl_quic_conn_get_channel(SSL *s);
uint64_t ossl_quic_set_options(SSL *s, uint64_t opts);
uint64_t ossl_quic_clear_options(SSL *s, uint64_t opts);
uint64_t ossl_quic_get_options(SSL *s);
int ossl_quic_has_pending(const SSL *s);
# endif

6
ssl/quic/quic_channel.c
View File

@ -486,6 +486,12 @@ CRYPTO_MUTEX *ossl_quic_channel_get_mutex(QUIC_CHANNEL *ch)
return ch->mutex;
}
int ossl_quic_channel_has_pending(const QUIC_CHANNEL *ch)
{
return ossl_quic_demux_has_pending(ch->demux)
|| ossl_qrx_processed_read_pending(ch->qrx);
}
/*
* QUIC Channel: Callbacks from Miscellaneous Subsidiary Components
* ================================================================

5
ssl/quic/quic_demux.c
View File

@ -629,3 +629,8 @@ void ossl_quic_demux_reinject_urxe(QUIC_DEMUX *demux,
ossl_list_urxe_insert_head(&demux->urx_pending, e);
e->demux_state = URXE_DEMUX_STATE_PENDING;
}
int ossl_quic_demux_has_pending(const QUIC_DEMUX *demux)
{
return ossl_list_urxe_head(&demux->urx_pending) != NULL;
}

4
ssl/quic/quic_impl.c
View File

@ -2116,6 +2116,7 @@ int ossl_quic_peek(SSL *s, void *buf, size_t len, size_t *bytes_read)
* SSL_pending
* -----------
*/
QUIC_TAKES_LOCK
static size_t ossl_quic_pending_int(const SSL *s)
{
@ -2145,7 +2146,8 @@ size_t ossl_quic_pending(const SSL *s)
int ossl_quic_has_pending(const SSL *s)
{
return ossl_quic_pending_int(s) > 0;
/* Do we have app-side pending data or pending URXEs or RXEs? */
return ossl_quic_pending_int(s) > 0 || ossl_quic_channel_has_pending(qc->ch);
}
/*

9
ssl/ssl_lib.c
View File

@ -1872,6 +1872,10 @@ int SSL_pending(const SSL *s)
int SSL_has_pending(const SSL *s)
{
#ifndef OPENSSL_NO_QUIC
const QUIC_CONNECTION *qc = QUIC_CONNECTION_FROM_SSL(s);
#endif
/*
* Similar to SSL_pending() but returns a 1 to indicate that we have
* processed or unprocessed data available or 0 otherwise (as opposed to the
@ -1889,6 +1893,11 @@ int SSL_has_pending(const SSL *s)
sc = SSL_CONNECTION_FROM_CONST_SSL(s);
#ifndef OPENSSL_NO_QUIC
if (qc != NULL)
return ossl_quic_has_pending(qc);
#endif
/* Check buffered app data if any first */
if (SSL_CONNECTION_IS_DTLS(sc)) {
TLS_RECORD *rdata;