diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-08-09 17:46:33 +0100 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-09-01 10:45:35 +0100 |
| commit | 92db6d628016baa146bfce8b645c13f64ad4bf68 (patch) | |
| tree | 4e99262d9aac877d7a01e6d34356f371bc595eb4 /doc/designs | |
| parent | b3e71dbf6863343cfabdbe2ba0443fcb69343874 (diff) | |
QUIC DDD: ddd-04-fd-nonblocking: Unplanned changes
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21715)
Diffstat (limited to 'doc/designs')
| -rw-r--r-- | doc/designs/ddd/ddd-04-fd-nonblocking.c | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/doc/designs/ddd/ddd-04-fd-nonblocking.c b/doc/designs/ddd/ddd-04-fd-nonblocking.c index ef15ecb29a..009ba571fe 100644 --- a/doc/designs/ddd/ddd-04-fd-nonblocking.c +++ b/doc/designs/ddd/ddd-04-fd-nonblocking.c @@ -28,7 +28,7 @@ SSL_CTX *create_ssl_ctx(void) SSL_CTX *ctx; #ifdef USE_QUIC - ctx = SSL_CTX_new(QUIC_client_method()); + ctx = SSL_CTX_new(OSSL_QUIC_client_method()); #else ctx = SSL_CTX_new(TLS_client_method()); #endif @@ -57,6 +57,9 @@ APP_CONN *new_conn(SSL_CTX *ctx, int fd, const char *bare_hostname) { APP_CONN *conn; SSL *ssl; +#ifdef USE_QUIC + static const unsigned char alpn[] = {5, 'd', 'u', 'm', 'm', 'y'}; +#endif conn = calloc(1, sizeof(APP_CONN)); if (conn == NULL) @@ -88,6 +91,16 @@ APP_CONN *new_conn(SSL_CTX *ctx, int fd, const char *bare_hostname) return NULL; } +#ifdef USE_QUIC + /* Configure ALPN, which is required for QUIC. */ + if (SSL_set_alpn_protos(ssl, alpn, sizeof(alpn))) { + /* Note: SSL_set_alpn_protos returns 1 for failure. */ + SSL_free(ssl); + free(conn); + return NULL; + } +#endif + conn->fd = fd; return conn; } @@ -185,7 +198,9 @@ int get_conn_fd(APP_CONN *conn) int get_conn_pending_tx(APP_CONN *conn) { #ifdef USE_QUIC - return POLLIN | POLLOUT | POLLERR; + return (SSL_net_read_desired(conn->ssl) ? POLLIN : 0) + | (SSL_net_write_desired(conn->ssl) ? POLLOUT : 0) + | POLLERR; #else return (conn->tx_need_rx ? POLLIN : 0) | POLLOUT | POLLERR; #endif @@ -193,7 +208,7 @@ int get_conn_pending_tx(APP_CONN *conn) int get_conn_pending_rx(APP_CONN *conn) { - return (conn->rx_need_tx ? POLLOUT : 0) | POLLIN | POLLERR; + return get_conn_pending_tx(conn); } #ifdef USE_QUIC @@ -203,9 +218,17 @@ int get_conn_pending_rx(APP_CONN *conn) * no need for such a call. This may change after the next call * to libssl. */ +static inline int timeval_to_ms(const struct timeval *t); + int get_conn_pump_timeout(APP_CONN *conn) { - return SSL_get_timeout(conn->ssl); + struct timeval tv; + int is_infinite; + + if (!SSL_get_event_timeout(conn->ssl, &tv, &is_infinite)) + return -1; + + return is_infinite ? -1 : timeval_to_ms(&tv); } /* @@ -214,7 +237,7 @@ int get_conn_pump_timeout(APP_CONN *conn) */ void pump(APP_CONN *conn) { - SSL_pump(conn->ssl); + SSL_handle_events(conn->ssl); } #endif |