summaryrefslogtreecommitdiffstats
path: root/include/internal
diff options
context:
space:
mode:
authorHugo Landau <hlandau@openssl.org>2023-01-16 15:24:17 +0000
committerPauli <pauli@openssl.org>2023-07-05 09:02:26 +1000
commit9280d26a3a14e2aa79ad26cc25e4f41fbaa828ec (patch)
tree0e4a2ca52e59bd6bb5a257b89044bb86c94c5555 /include/internal
parent9ea0e7299223d10f61eee4db62ed0d4aec8f52e4 (diff)
QUIC: Implement SSL_has_pending
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)
Diffstat (limited to 'include/internal')
-rw-r--r--include/internal/quic_channel.h1
-rw-r--r--include/internal/quic_demux.h5
-rw-r--r--include/internal/quic_ssl.h4
3 files changed, 10 insertions, 0 deletions
diff --git a/include/internal/quic_channel.h b/include/internal/quic_channel.h
index deade706af..8cc165ee8f 100644
--- a/include/internal/quic_channel.h
+++ b/include/internal/quic_channel.h
@@ -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
diff --git a/include/internal/quic_demux.h b/include/internal/quic_demux.h
index 1e5a85f9d7..d439fa67be 100644
--- a/include/internal/quic_demux.h
+++ b/include/internal/quic_demux.h
@@ -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
diff --git a/include/internal/quic_ssl.h b/include/internal/quic_ssl.h
index 48f05bfb7c..837c3ba7b5 100644
--- a/include/internal/quic_ssl.h
+++ b/include/internal/quic_ssl.h
@@ -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