proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-10 03:00:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ss: Fixed broken output for Netlink 'Peer Address:Port' column

Browse Source 
When output the netlink sockets:

    ss -A netlink state close

the layout is a little broken with a shifted 'Peer Address:Port'
stars and empty new lines. Fixed by making the port field to be
wider for 'Local Address:Port' column.

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
This commit is contained in:
vadimk 2014-10-18 20:46:29 +03:00 committed by Stephen Hemminger
parent 45a4770bc0
commit 2dc854854b
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
misc/ss.c
View File

@ -88,6 +88,8 @@ int state_width;
int addrp_width; int addrp_width;
int addr_width; int addr_width;
int serv_width; int serv_width;
int paddr_width;
int pserv_width;
int screen_width; int screen_width;
static const char *TCP_PROTO = "tcp"; static const char *TCP_PROTO = "tcp";
@ -3031,10 +3033,10 @@ static void netlink_show_one(struct filter *f,
if (state == NETLINK_CONNECTED) { if (state == NETLINK_CONNECTED) {
printf("%*d:%-*d", printf("%*d:%-*d",
addr_width, dst_group, serv_width, dst_pid); paddr_width, dst_group, pserv_width, dst_pid);
} else { } else {
printf("%*s*%-*s", printf("%*s*%-*s",
addr_width, "", serv_width, ""); paddr_width, "", pserv_width, "");
} }
char *pid_context = NULL; char *pid_context = NULL;
@ -3777,9 +3779,22 @@ int main(int argc, char *argv[])
printf("%-*s ", state_width, "State"); printf("%-*s ", state_width, "State");
printf("%-6s %-6s ", "Recv-Q", "Send-Q"); printf("%-6s %-6s ", "Recv-Q", "Send-Q");
paddr_width = addr_width;
pserv_width = serv_width;
/* Netlink service column can be resolved as process name/pid thus it
* can be much wider than address column which is just a
* protocol name/id.
*/
if (current_filter.dbs & (1<<NETLINK_DB)) {
serv_width = addr_width - 10;
paddr_width = 13;
pserv_width = 13;
}
printf("%*s:%-*s %*s:%-*s\n", printf("%*s:%-*s %*s:%-*s\n",
addr_width, "Local Address", serv_width, "Port", addr_width, "Local Address", serv_width, "Port",
addr_width, "Peer Address", serv_width, "Port"); paddr_width, "Peer Address", pserv_width, "Port");
fflush(stdout); fflush(stdout);