RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-21 06:25:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: proxy: fix dump_server_state()'s misuse of the trash

Browse Source 
dump_server_state() claims to dump into a buffer but instead it writes
into a buffer then dumps the trash into the channel, so it only supports
being called with buf=&trash and doesn't need this buffer. There doesn't
seem to be any current impact of this mistake since the function is called
from one location only.

A backport may be performed if it helps fixing other bugs but it will not
fix an existing bug by itself.
This commit is contained in:
Willy Tarreau 2020-07-01 07:02:42 +02:00
parent 2866acfb23
commit 6ff8143f7c
1 changed files with 4 additions and 4 deletions

8
src/proxy.c
View File

@ -1745,14 +1745,14 @@ static int cli_parse_show_servers(char **args, char *payload, struct appctx *app
return 0; return 0;
} }
/* dumps server state information into <buf> for all the servers found in backend cli.p0. /* dumps server state information for all the servers found in backend cli.p0.
* These information are all the parameters which may change during HAProxy runtime. * These information are all the parameters which may change during HAProxy runtime.
* By default, we only export to the last known server state file format. * By default, we only export to the last known server state file format.
* These information can be used at next startup to recover same level of server state. * These information can be used at next startup to recover same level of server state.
* It uses the proxy pointer from cli.p0, the proxy's id from cli.i0 and the server's * It uses the proxy pointer from cli.p0, the proxy's id from cli.i0 and the server's
* pointer from cli.p1. * pointer from cli.p1.
*/ */
static int dump_servers_state(struct stream_interface *si, struct buffer *buf) static int dump_servers_state(struct stream_interface *si)
{ {
struct appctx *appctx = __objt_appctx(si->end); struct appctx *appctx = __objt_appctx(si->end);
struct proxy *px = appctx->ctx.cli.p0; struct proxy *px = appctx->ctx.cli.p0;
@ -1794,7 +1794,7 @@ static int dump_servers_state(struct stream_interface *si, struct buffer *buf)
if (srv->srvrq && srv->srvrq->name) if (srv->srvrq && srv->srvrq->name)
srvrecord = srv->srvrq->name; srvrecord = srv->srvrq->name;
chunk_appendf(buf, chunk_appendf(&trash,
"%d %s " "%d %s "
"%d %s %s " "%d %s %s "
"%d %d %d %d %ld " "%d %d %d %d %ld "
@ -1846,7 +1846,7 @@ static int cli_io_handler_servers_state(struct appctx *appctx)
curproxy = appctx->ctx.cli.p0; curproxy = appctx->ctx.cli.p0;
/* servers are only in backends */ /* servers are only in backends */
if (curproxy->cap & PR_CAP_BE) { if (curproxy->cap & PR_CAP_BE) {
if (!dump_servers_state(si, &trash)) if (!dump_servers_state(si))
return 0; return 0;
} }
/* only the selected proxy is dumped */ /* only the selected proxy is dumped */