mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-27 05:41:10 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: cli: make "show cli sockets" use its own context

Browse Source 
Let's create a show_sock_ctx to store the bind_conf and the listener.
The entry is reserved when entering the I/O handler since there's no
parser here. That's fine because the function doesn't touch the area.
This commit is contained in:
Willy Tarreau 2022-05-05 19:11:05 +02:00
parent 4df54eb151
commit b128f49d89
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cli.c
View File

@ -98,6 +98,12 @@ struct show_fd_ctx {
int show_one; /* stop after showing one FD */ int show_one; /* stop after showing one FD */
}; };
/* CLI context for the "show cli sockets" command */
struct show_sock_ctx {
struct bind_conf *bind_conf;
struct listener *listener;
};
static int cmp_kw_entries(const void *a, const void *b) static int cmp_kw_entries(const void *a, const void *b)
{ {
const struct cli_kw *l = *(const struct cli_kw **)a; const struct cli_kw *l = *(const struct cli_kw **)a;
@ -1552,11 +1558,13 @@ static int cli_io_handler_show_activity(struct appctx *appctx)
/* /*
* CLI IO handler for `show cli sockets`. * CLI IO handler for `show cli sockets`.
* Uses ctx.cli.p0 to store the bind_conf pointer, and cli.p1 for the listener. * Uses the svcctx as a show_sock_ctx to store/retrieve the bind_conf and the
* listener pointers.
*/ */
static int cli_io_handler_show_cli_sock(struct appctx *appctx) static int cli_io_handler_show_cli_sock(struct appctx *appctx)
{ {
struct bind_conf *bind_conf = appctx->ctx.cli.p0; struct show_sock_ctx *ctx = applet_reserve_svcctx(appctx, sizeof(*ctx));
struct bind_conf *bind_conf = ctx->bind_conf;
struct conn_stream *cs = appctx->owner; struct conn_stream *cs = appctx->owner;
if (!global.cli_fe) if (!global.cli_fe)
@ -1572,7 +1580,7 @@ static int cli_io_handler_show_cli_sock(struct appctx *appctx)
} }
list_for_each_entry_from(bind_conf, &global.cli_fe->conf.bind, by_fe) { list_for_each_entry_from(bind_conf, &global.cli_fe->conf.bind, by_fe) {
struct listener *l = appctx->ctx.cli.p1; struct listener *l = ctx->listener;
if (!l) if (!l)
l = LIST_ELEM(bind_conf->listeners.n, typeof(l), by_bind); l = LIST_ELEM(bind_conf->listeners.n, typeof(l), by_bind);
@ -1615,8 +1623,8 @@ static int cli_io_handler_show_cli_sock(struct appctx *appctx)
chunk_appendf(&trash, "all\n"); chunk_appendf(&trash, "all\n");
if (ci_putchk(cs_ic(cs), &trash) == -1) { if (ci_putchk(cs_ic(cs), &trash) == -1) {
appctx->ctx.cli.p0 = bind_conf; ctx->bind_conf = bind_conf;
appctx->ctx.cli.p1 = l; ctx->listener = l;
goto full; goto full;
} }
} }