1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: cli/show_fd: report local and report ports when known

Browse Source 
FD dumps are not always easy to match against netstat dumps, and often
require an lsof as a third dump. Let's emit the socket family, and the
local and remore ports when the FD is an IPv4/IPv6 socket, this will
significantly ease the matching.
This commit is contained in:
Willy Tarreau 2021-02-05 10:54:52 +01:00
parent 2da742933d
commit ed9892018c
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/cli.c
View File

@ -1102,6 +1102,27 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
if (conn->handle.fd != fd) { if (conn->handle.fd != fd) {
chunk_appendf(&trash, " fd=%d(BOGUS)", conn->handle.fd); chunk_appendf(&trash, " fd=%d(BOGUS)", conn->handle.fd);
suspicious = 1; suspicious = 1;
} else {
struct sockaddr_storage sa;
socklen_t salen;
salen = sizeof(sa);
if (getsockname(fd, (struct sockaddr *)&sa, &salen) != -1) {
if (sa.ss_family == AF_INET)
chunk_appendf(&trash, " fam=ipv4 lport=%d", ntohs(((const struct sockaddr_in *)&sa)->sin_port));
else if (sa.ss_family == AF_INET6)
chunk_appendf(&trash, " fam=ipv6 lport=%d", ntohs(((const struct sockaddr_in6 *)&sa)->sin6_port));
else if (sa.ss_family == AF_UNIX)
chunk_appendf(&trash, " fam=unix");
}
salen = sizeof(sa);
if (getpeername(fd, (struct sockaddr *)&sa, &salen) != -1) {
if (sa.ss_family == AF_INET)
chunk_appendf(&trash, " rport=%d", ntohs(((const struct sockaddr_in *)&sa)->sin_port));
else if (sa.ss_family == AF_INET6)
chunk_appendf(&trash, " rport=%d", ntohs(((const struct sockaddr_in6 *)&sa)->sin6_port));
}
} }
if (px) if (px)
@ -1130,9 +1151,22 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
} }
} }
else if (fdt.iocb == sock_accept_iocb) { else if (fdt.iocb == sock_accept_iocb) {
struct sockaddr_storage sa;
socklen_t salen;
chunk_appendf(&trash, ") l.st=%s fe=%s", chunk_appendf(&trash, ") l.st=%s fe=%s",
listener_state_str(li), listener_state_str(li),
li->bind_conf->frontend->id); li->bind_conf->frontend->id);
salen = sizeof(sa);
if (getsockname(fd, (struct sockaddr *)&sa, &salen) != -1) {
if (sa.ss_family == AF_INET)
chunk_appendf(&trash, " fam=ipv4 lport=%d", ntohs(((const struct sockaddr_in *)&sa)->sin_port));
else if (sa.ss_family == AF_INET6)
chunk_appendf(&trash, " fam=ipv6 lport=%d", ntohs(((const struct sockaddr_in6 *)&sa)->sin6_port));
else if (sa.ss_family == AF_UNIX)
chunk_appendf(&trash, " fam=unix");
}
} }
else else
chunk_appendf(&trash, ")"); chunk_appendf(&trash, ")");