RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: cli: remove non-printable characters from 'debug dev fd' 

When using 'debug dev fd', the output of laddr and raddr can contain
some garbage.

This patch replaces any control or non-printable character by a '.'.
This commit is contained in:
William Lallemand 2024-10-24 16:31:56 +02:00
parent 4adb2d864d
commit 944a224358
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/debug.c
View File

@ -1865,6 +1865,8 @@ static int debug_iohandler_fd(struct appctx *appctx)
salen = sizeof(sa); salen = sizeof(sa);
if (getsockname(fd, (struct sockaddr *)&sa, &salen) != -1) { if (getsockname(fd, (struct sockaddr *)&sa, &salen) != -1) {
int i;
if (sa.ss_family == AF_INET) if (sa.ss_family == AF_INET)
port = ntohs(((const struct sockaddr_in *)&sa)->sin_port); port = ntohs(((const struct sockaddr_in *)&sa)->sin_port);
else if (sa.ss_family == AF_INET6) else if (sa.ss_family == AF_INET6)
@ -1872,6 +1874,12 @@ static int debug_iohandler_fd(struct appctx *appctx)
else else
port = 0; port = 0;
addrstr = sa2str(&sa, port, 0); addrstr = sa2str(&sa, port, 0);
/* cleanup the output */
for (i = 0; i < strlen(addrstr); i++) {
if (iscntrl((unsigned char)addrstr[i]) || !isprint((unsigned char)addrstr[i]))
addrstr[i] = '.';
}
chunk_appendf(&trash, " laddr=%s", addrstr); chunk_appendf(&trash, " laddr=%s", addrstr);
free(addrstr); free(addrstr);
} }
@ -1885,6 +1893,11 @@ static int debug_iohandler_fd(struct appctx *appctx)
else else
port = 0; port = 0;
addrstr = sa2str(&sa, port, 0); addrstr = sa2str(&sa, port, 0);
/* cleanup the output */
for (i = 0; i < strlen(addrstr); i++) {
if ((iscntrl((unsigned char)addrstr[i])) || !isprint((unsigned char)addrstr[i]))
addrstr[i] = '.';
}
chunk_appendf(&trash, " raddr=%s", addrstr); chunk_appendf(&trash, " raddr=%s", addrstr);
free(addrstr); free(addrstr);
} }