From: Willy Tarreau <w@1wt.eu>
Date: Mon, 29 Jan 2018 14:17:05 +0000 (+0100)
Subject: BUG/MINOR: cli: use global.maxsock and not maxfd to list all FDs
X-Git-Tag: v1.9-dev1~482
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccea35c9800756f867aff8ec2752fa75480ac345;p=thirdparty%2Fhaproxy.git

BUG/MINOR: cli: use global.maxsock and not maxfd to list all FDs

The "show fd" command on the CLI doesn't list the last FD in use since
it doesn't include maxfd. We don't need to use maxfd here anyway as
global.maxsock will do the job pretty well and removes this dependency.
This patch may be backported to 1.8.
---

diff --git a/src/cli.c b/src/cli.c
index d5c615bb1b..cff59f28ac 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -772,7 +772,7 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
 	/* we have two inner loops here, one for the proxy, the other one for
 	 * the buffer.
 	 */
-	while (fd < maxfd) {
+	while (fd < global.maxsock) {
 		struct fdtab fdt;
 		struct listener *li = NULL;
 		struct server *sv = NULL;