[iproute PATCH v2 02/18] ss: Drop empty lines in UDP output

[Phil Sutter]

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 <p...@nwl.cc>
---
 misc/ss.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/ss.c b/misc/ss.c
index 469721fd9aee3..3871a6f61f8ea 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -2412,7 +2412,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");
                if (protocol == IPPROTO_SCTP)
                        sctp_show_info(nlh, r, tb);
-- 
2.10.0