From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cong Wang Subject: [Patch iproute2 v2] ss: add UNIX_DIAG_VFS and UNIX_DIAG_ICONS for unix sockets Date: Wed, 29 Aug 2018 10:09:27 -0700 Message-ID: <20180829170927.16900-1-xiyou.wangcong@gmail.com> Cc: Cong Wang , Stephen Hemminger To: netdev@vger.kernel.org Return-path: Received: from mail-pf1-f194.google.com ([209.85.210.194]:46294 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727704AbeH2VH1 (ORCPT ); Wed, 29 Aug 2018 17:07:27 -0400 Received: by mail-pf1-f194.google.com with SMTP id u24-v6so2543091pfn.13 for ; Wed, 29 Aug 2018 10:09:35 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: UNIX_DIAG_VFS and UNIX_DIAG_ICONS are never used by ss, make them available in ss -e output. Cc: Stephen Hemminger Signed-off-by: Cong Wang --- misc/ss.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/misc/ss.c b/misc/ss.c index 41e7762b..b2c634c8 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -3604,6 +3605,21 @@ static int unix_show_sock(const struct sockaddr_nl *addr, struct nlmsghdr *nlh, out(" %c-%c", mask & 1 ? '-' : '<', mask & 2 ? '-' : '>'); } + if (tb[UNIX_DIAG_VFS]) { + struct unix_diag_vfs *uv = RTA_DATA(tb[UNIX_DIAG_VFS]); + + out(" ino:%u dev:%u/%u", uv->udiag_vfs_ino, major(uv->udiag_vfs_dev), + minor(uv->udiag_vfs_dev)); + } + if (tb[UNIX_DIAG_ICONS]) { + int len = RTA_PAYLOAD(tb[UNIX_DIAG_ICONS]); + __u32 *peers = RTA_DATA(tb[UNIX_DIAG_ICONS]); + int i; + + out(" peers:"); + for (i = 0; i < len / sizeof(__u32); i++) + out(" %u", peers[i]); + } } return 0; @@ -3641,6 +3657,8 @@ static int unix_show_netlink(struct filter *f) req.r.udiag_show = UDIAG_SHOW_NAME | UDIAG_SHOW_PEER | UDIAG_SHOW_RQLEN; if (show_mem) req.r.udiag_show |= UDIAG_SHOW_MEMINFO; + if (show_details) + req.r.udiag_show |= UDIAG_SHOW_VFS | UDIAG_SHOW_ICONS; return handle_netlink_request(f, &req.nlh, sizeof(req), unix_show_sock); } -- 2.14.4