matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ss: Drop empty lines in UDP output 

When dumping UDP sockets and show_tcpinfo (-i) is active but not
show_mem (-m), print_tcpinfo() does not output anything leading to an
empty line being printed after every socket. Fix this by skipping the
call to print_tcpinfo() and the previous newline printing in that case.

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2016-12-02 11:39:46 +01:00 committed by Stephen Hemminger
parent 36df1a6e92
commit 6babc649a9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/ss.c
View File

@ -2444,7 +2444,7 @@ static int inet_show_sock(struct nlmsghdr *nlh,
} }
} }
if (show_mem || show_tcpinfo) { if (show_mem || (show_tcpinfo && protocol != IPPROTO_UDP)) {
printf("\n\t"); printf("\n\t");
if (protocol == IPPROTO_SCTP) if (protocol == IPPROTO_SCTP)
sctp_show_info(nlh, r, tb); sctp_show_info(nlh, r, tb);