From acf6a44908dad73a375edc5eac1c55bd0aebd5d1 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 5 May 2022 17:05:38 +0200 Subject: [PATCH] CLEANUP: proxy/cli: make "show backend" only use the generic context Let's use appctx->svcctx instead of abusing cli.p0 to store the current proxy being dumped. --- src/proxy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/proxy.c b/src/proxy.c index 92e4f4bcfd..0badc1121c 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -2824,7 +2824,7 @@ static int cli_io_handler_servers_state(struct appctx *appctx) } /* Parses backend list and simply report backend names. It keeps the proxy - * pointer in cli.p0. + * pointer in svcctx since there's nothing else to store there. */ static int cli_io_handler_show_backend(struct appctx *appctx) { @@ -2833,17 +2833,17 @@ static int cli_io_handler_show_backend(struct appctx *appctx) chunk_reset(&trash); - if (!appctx->ctx.cli.p0) { + if (!appctx->svcctx) { chunk_printf(&trash, "# name\n"); if (ci_putchk(cs_ic(cs), &trash) == -1) { cs_rx_room_blk(cs); return 0; } - appctx->ctx.cli.p0 = proxies_list; + appctx->svcctx = proxies_list; } - for (; appctx->ctx.cli.p0 != NULL; appctx->ctx.cli.p0 = curproxy->next) { - curproxy = appctx->ctx.cli.p0; + for (; appctx->svcctx != NULL; appctx->svcctx = curproxy->next) { + curproxy = appctx->svcctx; /* looking for non-internal backends only */ if ((curproxy->cap & (PR_CAP_BE|PR_CAP_INT)) != PR_CAP_BE) -- 2.47.3