From patchwork Tue Feb 11 09:06:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FX Le Bail X-Patchwork-Id: 319188 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EBBAD2C00A5 for ; Tue, 11 Feb 2014 20:36:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750978AbaBKJfz (ORCPT ); Tue, 11 Feb 2014 04:35:55 -0500 Received: from smtp04.smtpout.orange.fr ([80.12.242.126]:51414 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750776AbaBKJfw (ORCPT ); Tue, 11 Feb 2014 04:35:52 -0500 Received: from l-fxstation-3a.rd.francetelecom.fr ([2.10.73.72]) by mwinf5d51 with ME id Qxbg1n01T1ZaZxN03xbn0p; Tue, 11 Feb 2014 10:35:49 +0100 From: Francois-Xavier Le Bail To: Stephen Hemminger , Bernd Eckenfels , NETDEV Subject: [PATCH iproute2 v2] ss: display interface name as zone index when needed Date: Tue, 11 Feb 2014 10:06:23 +0100 Message-Id: <1392109583-25025-1-git-send-email-fx.lebail@yahoo.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This change enable the ss command to display the interface name as zone index for local addresses when needed. For this enhanced display *_diag stuff is needed. It is based on a first version by Bernd Eckenfels. example: Netid State Recv-Q Send-Q Local Address:Port Peer Address:Port udp UNCONN 0 0 fe80::20c:29ff:fe1f:7406%eth1:9999 :::* udp UNCONN 0 0 :::domain :::* tcp LISTEN 0 3 :::domain :::* tcp LISTEN 0 5 fe80::20c:29ff:fe1f:7410%eth2:99 :::* Signed-off-by: Francois-Xavier Le Bail --- v2: Consideration of Stephen's comment (thanks!): Use ll_index_to_name() instead of if_indextoname(). misc/ss.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/misc/ss.c b/misc/ss.c index 37dcc11..ce6a0a8 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -640,7 +640,7 @@ static const char *resolve_service(int port) return buf; } -static void formatted_print(const inet_prefix *a, int port) +static void formatted_print(const inet_prefix *a, int port, unsigned int ifindex) { char buf[1024]; const char *ap = buf; @@ -663,7 +663,14 @@ static void formatted_print(const inet_prefix *a, int port) else est_len = addr_width + ((est_len-addr_width+3)/4)*4; } - printf("%*s:%-*s ", est_len, ap, serv_width, resolve_service(port)); + if (ifindex) { + const char *ifname = ll_index_to_name(ifindex); + const int len = strlen(ifname) + 1; /* +1 for percent char */ + + printf("%*s%%%s:%-*s ", est_len - len, ap, ifname, serv_width, + resolve_service(port)); + } else + printf("%*s:%-*s ", est_len, ap, serv_width, resolve_service(port)); } struct aafilter @@ -1254,8 +1261,8 @@ static int tcp_show_line(char *line, const struct filter *f, int family) printf("%-6d %-6d ", s.rq, s.wq); - formatted_print(&s.local, s.lport); - formatted_print(&s.remote, s.rport); + formatted_print(&s.local, s.lport, 0); + formatted_print(&s.remote, s.rport, 0); if (show_options) { if (s.timer) { @@ -1507,8 +1514,8 @@ static int inet_show_sock(struct nlmsghdr *nlh, struct filter *f, int protocol) printf("%-6d %-6d ", r->idiag_rqueue, r->idiag_wqueue); - formatted_print(&s.local, s.lport); - formatted_print(&s.remote, s.rport); + formatted_print(&s.local, s.lport, r->id.idiag_if); + formatted_print(&s.remote, s.rport, 0); if (show_options) { if (r->idiag_timer) { @@ -2006,8 +2013,8 @@ static int dgram_show_line(char *line, const struct filter *f, int family) printf("%-6d %-6d ", s.rq, s.wq); - formatted_print(&s.local, s.lport); - formatted_print(&s.remote, s.rport); + formatted_print(&s.local, s.lport, 0); + formatted_print(&s.remote, s.rport, 0); if (show_users) { char ubuf[4096];