From: Phil Sutter <phil@nwl.cc>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: netdev@vger.kernel.org
Subject: [iproute PATCH v2 03/18] ss: Add missing tab when printing UNIX details
Date: Fri, 2 Dec 2016 11:39:47 +0100 [thread overview]
Message-ID: <20161202104002.17310-4-phil@nwl.cc> (raw)
In-Reply-To: <20161202104002.17310-1-phil@nwl.cc>
When dumping UNIX sockets and show_details is active but not show_mem
(ss -xne), the socket details are printed without being prefixed by tab.
Fix this by printing the tab character when either one of '-e' or '-m'
has been specified.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
misc/ss.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/misc/ss.c b/misc/ss.c
index 3871a6f61f8ea..f1053b1db4132 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -3096,10 +3096,10 @@ static int unix_show_sock(const struct sockaddr_nl *addr, struct nlmsghdr *nlh,
unix_stats_print(&stat, f);
- if (show_mem) {
+ if (show_mem || show_details)
printf("\t");
+ if (show_mem)
print_skmeminfo(tb, UNIX_DIAG_MEMINFO);
- }
if (show_details) {
if (tb[UNIX_DIAG_SHUTDOWN]) {
unsigned char mask;
--
2.10.0
next prev parent reply other threads:[~2016-12-02 10:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 10:39 [iproute PATCH v2 00/18] ss: Minor code review Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 01/18] ss: Mark fall through in arg parsing switch() Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 02/18] ss: Drop empty lines in UDP output Phil Sutter
2016-12-02 10:39 ` Phil Sutter [this message]
2016-12-02 10:39 ` [iproute PATCH v2 04/18] ss: Use sockstat->type in all socket types Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 05/18] ss: introduce proc_ctx_print() Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 06/18] ss: Drop list traversal from unix_stats_print() Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 07/18] ss: Eliminate unix_use_proc() Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 08/18] ss: Turn generic_proc_open() wrappers into macros Phil Sutter
2016-12-05 17:02 ` David Laight
2016-12-05 17:24 ` Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 09/18] ss: Make tmr_name local to tcp_timer_print() Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 10/18] ss: Make user_ent_hash_build_init local to user_ent_hash_build() Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 11/18] ss: Make some variables function-local Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 12/18] ss: Make slabstat_ids local to get_slabstat() Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 13/18] ss: Get rid of useless goto in handle_follow_request() Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 14/18] ss: Get rid of single-fielded struct snmpstat Phil Sutter
2016-12-02 10:39 ` [iproute PATCH v2 15/18] ss: Make unix_state_map local to unix_show() Phil Sutter
2016-12-02 10:40 ` [iproute PATCH v2 16/18] ss: Make sstate_name local to sock_state_print() Phil Sutter
2016-12-02 10:40 ` [iproute PATCH v2 17/18] ss: Make sstate_namel local to scan_state() Phil Sutter
2016-12-02 10:40 ` [iproute PATCH v2 18/18] ss: unix_show: No need to initialize members of calloc'ed structs Phil Sutter
2016-12-02 22:09 ` [iproute PATCH v2 00/18] ss: Minor code review Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161202104002.17310-4-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).