MINOR: cli: give the show_fd helpers the ability to report a suspicious entry
Now the show_fd helpers at the transport and mux levels return an integer
which indicates whether or not the inspected entry looks suspicious. When
an entry is reported as suspicious, "show fd" will suffix it with an
exclamation mark ('!') in the dump, that is supposed to help detecting
them.
For now, helpers were adjusted to adapt to the new API but none of them
reports any suspicious entry yet.
(cherry picked from commit 8050efeacb554f798a49db5ef213c8f673e5596e)
Signed-off-by: Willy Tarreau <w@1wt.eu>
diff --git a/src/cli.c b/src/cli.c
index 5ada692..47b28fc 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1037,6 +1037,7 @@
const void *xprt_ctx = NULL;
uint32_t conn_flags = 0;
int is_back = 0;
+ int suspicious = 0;
fdt = fdtab[fd];
@@ -1100,7 +1101,7 @@
if (mux) {
chunk_appendf(&trash, " mux=%s ctx=%p", mux->name, ctx);
if (mux->show_fd)
- mux->show_fd(&trash, fdt.owner);
+ suspicious |= mux->show_fd(&trash, fdt.owner);
}
else
chunk_appendf(&trash, " nomux");
@@ -1110,7 +1111,7 @@
if (xprt_ctx || xprt->show_fd)
chunk_appendf(&trash, " xprt_ctx=%p", xprt_ctx);
if (xprt->show_fd)
- xprt->show_fd(&trash, conn, xprt_ctx);
+ suspicious |= xprt->show_fd(&trash, conn, xprt_ctx);
}
}
else if (fdt.iocb == sock_accept_iocb) {
@@ -1124,7 +1125,7 @@
#ifdef DEBUG_FD
chunk_appendf(&trash, " evcnt=%u", fdtab[fd].event_count);
#endif
- chunk_appendf(&trash, "\n");
+ chunk_appendf(&trash, "%s\n", suspicious ? " !" : "");
if (ci_putchk(si_ic(si), &trash) == -1) {
si_rx_room_blk(si);