From: William Lallemand <wlallemand@haproxy.com>
Date: Tue, 20 Nov 2018 16:36:51 +0000 (+0100)
Subject: MINOR: cli: add mworker_accept_wrapper to 'show fd'
X-Git-Tag: v1.9-dev8~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db6bdfbf684e3f25f3bd0895038c41877d89480f;p=thirdparty%2Fhaproxy.git

MINOR: cli: add mworker_accept_wrapper to 'show fd'

In the output of 'show fd', the worker CLI's socketpair was still
handled by an "unknown" function. That can be really confusing during
debug. Fixed it by showing "mworker_accept_wrapper" instead.
---

diff --git a/include/types/global.h b/include/types/global.h
index 02b9c26ae1..7c6f954201 100644
--- a/include/types/global.h
+++ b/include/types/global.h
@@ -272,6 +272,8 @@ void hap_register_post_deinit(void (*fct)());
 void hap_register_per_thread_init(int (*fct)());
 void hap_register_per_thread_deinit(void (*fct)());
 
+void mworker_accept_wrapper(int fd);
+
 #endif /* _TYPES_GLOBAL_H */
 
 /*
diff --git a/src/cli.c b/src/cli.c
index 4356586bf6..ef58ba616c 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -921,6 +921,7 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
 			     (fdt.iocb == dgram_fd_handler) ? "dgram_fd_handler" :
 			     (fdt.iocb == listener_accept)  ? "listener_accept" :
 			     (fdt.iocb == poller_pipe_io_handler) ? "poller_pipe_io_handler" :
+			     (fdt.iocb == mworker_accept_wrapper) ? "mworker_accept_wrapper" :
 			     "unknown");
 
 		if (fdt.iocb == conn_fd_handler) {