RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-02 18:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: peers/cli: make peers_dump_peer() take an appctx instead of an stconn

Browse Source 
By having the appctx in argument this function wouldn't have experienced
the previous bug. Better do that now to avoid proliferation of awkward
functions.
This commit is contained in:
Willy Tarreau 2022-05-31 08:55:54 +02:00
parent fc5059958f
commit 50e77b2b85
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/peers.c
View File

@ -3771,7 +3771,7 @@ static int peers_dump_head(struct buffer *msg, struct appctx *appctx, struct pee
* Returns 0 if the output buffer is full and needs to be called again, non-zero
* if not. Dedicated to be called by cli_io_handler_show_peers() cli I/O handler.
*/
static int peers_dump_peer(struct buffer *msg, struct stconn *sc, struct peer *peer, int flags)
static int peers_dump_peer(struct buffer *msg, struct appctx *appctx, struct peer *peer, int flags)
{
struct connection *conn;
char pn[INET6_ADDRSTRLEN];
@ -3916,7 +3916,7 @@ static int peers_dump_peer(struct buffer *msg, struct stconn *sc, struct peer *p
end:
chunk_appendf(&trash, "\n");
if (applet_putchk(sc_appctx(sc), msg) == -1)
if (applet_putchk(appctx, msg) == -1)
return 0;
return 1;
@ -3967,7 +3967,7 @@ static int cli_io_handler_show_peers(struct appctx *appctx)
ctx->state = STATE_DONE;
}
else {
if (!peers_dump_peer(&trash, appctx_sc(appctx), ctx->peer, ctx->flags))
if (!peers_dump_peer(&trash, appctx, ctx->peer, ctx->flags))
goto out;
ctx->peer = ctx->peer->next;