RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-11 05:48:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: ssl/cli: async fd io-handlers printable on show fd

Browse Source 
This patch exports the async fd iohandlers and make them printable
doing a 'show fd' on cli.
This commit is contained in:
Emeric Brun 2019-04-19 17:15:28 +02:00 committed by Willy Tarreau
parent 46451d6e04
commit d0e095c2aa
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/proto/ssl_sock.h
View File

@ -85,6 +85,10 @@ SSL_CTX *ssl_sock_get_generated_cert(unsigned int key, struct bind_conf *bind_co
int ssl_sock_set_generated_cert(SSL_CTX *ctx, unsigned int key, struct bind_conf *bind_conf);
unsigned int ssl_sock_generated_cert_key(const void *data, size_t len);
#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(OPENSSL_NO_ASYNC)
void ssl_async_fd_handler(int fd);
void ssl_async_fd_free(int fd);
#endif
/* ssl shctx macro */

9
src/cli.c
View File

@ -69,6 +69,9 @@
#include <proto/stream_interface.h>
#include <proto/task.h>
#include <proto/proto_udp.h>
#ifdef USE_OPENSSL
#include <proto/ssl_sock.h>
#endif
#define PAYLOAD_PATTERN "<<"
@ -998,6 +1001,12 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
(fdt.iocb == listener_accept) ? "listener_accept" :
(fdt.iocb == poller_pipe_io_handler) ? "poller_pipe_io_handler" :
(fdt.iocb == mworker_accept_wrapper) ? "mworker_accept_wrapper" :
#ifdef USE_OPENSSL
#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(OPENSSL_NO_ASYNC)
(fdt.iocb == ssl_async_fd_free) ? "ssl_async_fd_free" :
(fdt.iocb == ssl_async_fd_handler) ? "ssl_async_fd_handler" :
#endif
#endif
"unknown");
if (fdt.iocb == conn_fd_handler) {

4
src/ssl_sock.c
View File

@ -573,7 +573,7 @@ fail_get:
/*
* openssl async fd handler
*/
static void ssl_async_fd_handler(int fd)
void ssl_async_fd_handler(int fd)
{
struct connection *conn = fdtab[fd].owner;
@ -594,7 +594,7 @@ static void ssl_async_fd_handler(int fd)
/*
* openssl async delayed SSL_free handler
*/
static void ssl_async_fd_free(int fd)
void ssl_async_fd_free(int fd)
{
SSL *ssl = fdtab[fd].owner;
OSSL_ASYNC_FD all_fd[32];