From: William Lallemand <wlallemand@haproxy.com>
Date: Fri, 26 Oct 2018 12:47:41 +0000 (+0200)
Subject: MINOR: cli: displays sockpair@ in "show cli sockets"
X-Git-Tag: v1.9-dev5~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2631434b4b96eccfc4368769226736e605857b85;p=thirdparty%2Fhaproxy.git

MINOR: cli: displays sockpair@ in "show cli sockets"

The 'show cli sockets' was not handling the sockpairs, it now displays
the fd of the socket and also show the unknown protocols.
---

diff --git a/src/cli.c b/src/cli.c
index f7fb6f0e7e..cc1f6813cb 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1068,8 +1068,10 @@ static int cli_io_handler_show_cli_sock(struct appctx *appctx)
 							addr_to_str(&l->addr, addr, sizeof(addr));
 							port_to_str(&l->addr, port, sizeof(port));
 							chunk_appendf(&trash, "[%s]:%s ", addr, port);
+						} else if (l->addr.ss_family == AF_CUST_SOCKPAIR) {
+							chunk_appendf(&trash, "sockpair@%d ", ((struct sockaddr_in *)&l->addr)->sin_addr.s_addr);
 						} else
-							continue;
+							chunk_appendf(&trash, "unknown ");
 
 						if ((bind_conf->level & ACCESS_LVL_MASK) == ACCESS_LVL_ADMIN)
 							chunk_appendf(&trash, "admin ");