From: Phil Sutter <phil@nwl.cc>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: netdev@vger.kernel.org
Subject: [iproute PATCH v2 14/18] ss: Get rid of single-fielded struct snmpstat
Date: Fri, 2 Dec 2016 11:39:58 +0100 [thread overview]
Message-ID: <20161202104002.17310-15-phil@nwl.cc> (raw)
In-Reply-To: <20161202104002.17310-1-phil@nwl.cc>
A struct with only a single field does not make much sense. Besides
that, it was used by print_summary() only.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
misc/ss.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/misc/ss.c b/misc/ss.c
index ec71c21ce6a4a..c7818eadf9e75 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -3661,10 +3661,6 @@ static int handle_follow_request(struct filter *f)
return ret;
}
-struct snmpstat {
- int tcp_estab;
-};
-
static int get_snmp_int(char *proto, char *key, int *result)
{
char buf[1024];
@@ -3785,11 +3781,11 @@ static int get_sockstat(struct ssummary *s)
static int print_summary(void)
{
struct ssummary s;
- struct snmpstat sn;
+ int tcp_estab;
if (get_sockstat(&s) < 0)
perror("ss: get_sockstat");
- if (get_snmp_int("Tcp:", "CurrEstab", &sn.tcp_estab) < 0)
+ if (get_snmp_int("Tcp:", "CurrEstab", &tcp_estab) < 0)
perror("ss: get_snmpstat");
get_slabstat(&slabstat);
@@ -3798,7 +3794,7 @@ static int print_summary(void)
printf("TCP: %d (estab %d, closed %d, orphaned %d, synrecv %d, timewait %d/%d), ports %d\n",
s.tcp_total + slabstat.tcp_syns + s.tcp_tws,
- sn.tcp_estab,
+ tcp_estab,
s.tcp_total - (s.tcp4_hashed+s.tcp6_hashed-s.tcp_tws),
s.tcp_orphans,
slabstat.tcp_syns,
--
2.10.0
next prev parent reply other threads:[~2016-12-02 10:42 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 ` [iproute PATCH v2 03/18] ss: Add missing tab when printing UNIX details Phil Sutter
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 ` Phil Sutter [this message]
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-15-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).