mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-05 13:06:10 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: cli: start addresses by a prefix in 'show cli sockets'

Browse Source 
Displays a prefix for every addresses in 'show cli sockets'.
It could be 'unix@', 'ipv4@', 'ipv6@', 'abns@' or 'sockpair@'.

Could be backported in 1.9 and 1.8.
This commit is contained in:
William Lallemand 2019-04-01 11:30:05 +02:00 committed by Willy Tarreau
parent 75812a7a3c
commit e58915f07f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cli.c
View File

@ -1078,18 +1078,19 @@ static int cli_io_handler_show_cli_sock(struct appctx *appctx)
const struct sockaddr_un *un; const struct sockaddr_un *un;
un = (struct sockaddr_un *)&l->addr; un = (struct sockaddr_un *)&l->addr;
if (un->sun_path[0] == '\0') if (un->sun_path[0] == '\0') {
chunk_appendf(&trash, "abns@%s ", un->sun_path+1); chunk_appendf(&trash, "abns@%s ", un->sun_path+1);
else } else {
chunk_appendf(&trash, "%s ", un->sun_path); chunk_appendf(&trash, "unix@%s ", un->sun_path);
}
} else if (l->addr.ss_family == AF_INET) { } else if (l->addr.ss_family == AF_INET) {
addr_to_str(&l->addr, addr, sizeof(addr)); addr_to_str(&l->addr, addr, sizeof(addr));
port_to_str(&l->addr, port, sizeof(port)); port_to_str(&l->addr, port, sizeof(port));
chunk_appendf(&trash, "%s:%s ", addr, port); chunk_appendf(&trash, "ipv4@%s:%s ", addr, port);
} else if (l->addr.ss_family == AF_INET6) { } else if (l->addr.ss_family == AF_INET6) {
addr_to_str(&l->addr, addr, sizeof(addr)); addr_to_str(&l->addr, addr, sizeof(addr));
port_to_str(&l->addr, port, sizeof(port)); port_to_str(&l->addr, port, sizeof(port));
chunk_appendf(&trash, "[%s]:%s ", addr, port); chunk_appendf(&trash, "ipv6@[%s]:%s ", addr, port);
} else if (l->addr.ss_family == AF_CUST_SOCKPAIR) { } else if (l->addr.ss_family == AF_CUST_SOCKPAIR) {
chunk_appendf(&trash, "sockpair@%d ", ((struct sockaddr_in *)&l->addr)->sin_addr.s_addr); chunk_appendf(&trash, "sockpair@%d ", ((struct sockaddr_in *)&l->addr)->sin_addr.s_addr);
} else } else