Return-Path: Received: from mail-pl0-f67.google.com ([209.85.160.67]:40000 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751428AbeBXTQS (ORCPT ); Sat, 24 Feb 2018 14:16:18 -0500 Received: by mail-pl0-f67.google.com with SMTP id i6so6886579plt.7 for ; Sat, 24 Feb 2018 11:16:18 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: ikomyagin@gmail.com, Stephen Hemminger Subject: [PATCH iproute2 2/3] ss: convert socket statistics to unsigned Date: Sat, 24 Feb 2018 11:16:06 -0800 Message-Id: <20180224191607.23892-3-stephen@networkplumber.org> In-Reply-To: <20180224191607.23892-1-stephen@networkplumber.org> References: <20180224191607.23892-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org List-ID: The kernel keeps these values as unsigned not signed integer. Signed-off-by: Stephen Hemminger --- misc/ss.c | 96 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index fefe5c813c44..4c7057198eb2 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -674,10 +674,10 @@ next: /* Get stats from slab */ struct slabstat { - int socks; - int tcp_ports; - int tcp_tws; - int tcp_syns; + unsigned int socks; + unsigned int tcp_ports; + unsigned int tcp_tws; + unsigned int tcp_syns; }; static struct slabstat slabstat; @@ -687,13 +687,14 @@ static int get_slabstat(struct slabstat *s) char buf[256]; FILE *fp; int cnt; - static int slabstat_valid; + static bool slabstat_valid; static const char * const slabstat_ids[] = { "sock", "tcp_bind_bucket", "tcp_tw_bucket", "tcp_open_request", }; + unsigned int *vals = (unsigned int *) s; if (slabstat_valid) return 0; @@ -715,7 +716,7 @@ static int get_slabstat(struct slabstat *s) for (i = 0; i < ARRAY_SIZE(slabstat_ids); i++) { if (memcmp(buf, slabstat_ids[i], strlen(slabstat_ids[i])) == 0) { - sscanf(buf, "%*s%d", ((int *)s) + i); + sscanf(buf, "%*s%u", vals + i); cnt--; break; } @@ -724,7 +725,7 @@ static int get_slabstat(struct slabstat *s) break; } - slabstat_valid = 1; + slabstat_valid = true; fclose(fp); return 0; @@ -3287,8 +3288,7 @@ static int tcp_show(struct filter *f) */ if (1) { get_slabstat(&slabstat); - - int guess = slabstat.socks+slabstat.tcp_syns; + unsigned int guess = slabstat.socks + slabstat.tcp_syns; if (f->states&(1<socks); + sscanf(rem, "%*s%u", &s->socks); else if (strcmp(id, "UDP:") == 0) - sscanf(rem, "%*s%d", &s->udp4); + sscanf(rem, "%*s%u", &s->udp4); else if (strcmp(id, "UDP6:") == 0) - sscanf(rem, "%*s%d", &s->udp6); + sscanf(rem, "%*s%u", &s->udp6); else if (strcmp(id, "RAW:") == 0) - sscanf(rem, "%*s%d", &s->raw4); + sscanf(rem, "%*s%u", &s->raw4); else if (strcmp(id, "RAW6:") == 0) - sscanf(rem, "%*s%d", &s->raw6); + sscanf(rem, "%*s%u", &s->raw6); else if (strcmp(id, "TCP6:") == 0) - sscanf(rem, "%*s%d", &s->tcp6_hashed); + sscanf(rem, "%*s%u", &s->tcp6_hashed); else if (strcmp(id, "FRAG:") == 0) - sscanf(rem, "%*s%d%*s%d", &s->frag4, &s->frag4_mem); + sscanf(rem, "%*s%u%*s%u", &s->frag4, &s->frag4_mem); else if (strcmp(id, "FRAG6:") == 0) - sscanf(rem, "%*s%d%*s%d", &s->frag6, &s->frag6_mem); + sscanf(rem, "%*s%u%*s%u", &s->frag6, &s->frag6_mem); else if (strcmp(id, "TCP:") == 0) - sscanf(rem, "%*s%d%*s%d%*s%d%*s%d%*s%d", + sscanf(rem, "%*s%u%*s%u%*s%u%*s%u%*s%u", &s->tcp4_hashed, &s->tcp_orphans, &s->tcp_tws, &s->tcp_total, &s->tcp_mem); } @@ -4436,8 +4436,8 @@ static int get_sockstat(struct ssummary *s) static int print_summary(void) { + unsigned int tcp_estab; struct ssummary s; - int tcp_estab; if (get_sockstat(&s) < 0) perror("ss: get_sockstat"); @@ -4446,9 +4446,9 @@ static int print_summary(void) get_slabstat(&slabstat); - printf("Total: %d (kernel %d)\n", s.socks, slabstat.socks); + printf("Total: %u (kernel %u)\n", s.socks, slabstat.socks); - printf("TCP: %d (estab %d, closed %d, orphaned %d, synrecv %d, timewait %d/%d), ports %d\n", + printf("TCP: %u (estab %u, closed %u, orphaned %u, synrecv %u, timewait %u/%u), ports %u\n", s.tcp_total + slabstat.tcp_syns + s.tcp_tws, tcp_estab, s.tcp_total - (s.tcp4_hashed+s.tcp6_hashed-s.tcp_tws), @@ -4460,16 +4460,16 @@ static int print_summary(void) printf("\n"); printf("Transport Total IP IPv6\n"); - printf("* %-9d %-9s %-9s\n", slabstat.socks, "-", "-"); - printf("RAW %-9d %-9d %-9d\n", s.raw4+s.raw6, s.raw4, s.raw6); - printf("UDP %-9d %-9d %-9d\n", s.udp4+s.udp6, s.udp4, s.udp6); - printf("TCP %-9d %-9d %-9d\n", s.tcp4_hashed+s.tcp6_hashed, s.tcp4_hashed, s.tcp6_hashed); - printf("INET %-9d %-9d %-9d\n", - s.raw4+s.udp4+s.tcp4_hashed+ - s.raw6+s.udp6+s.tcp6_hashed, - s.raw4+s.udp4+s.tcp4_hashed, - s.raw6+s.udp6+s.tcp6_hashed); - printf("FRAG %-9d %-9d %-9d\n", s.frag4+s.frag6, s.frag4, s.frag6); + printf("* %-9u %-9s %-9s\n", slabstat.socks, "-", "-"); + printf("RAW %-9u %-9u %-9u\n", s.raw4+s.raw6, s.raw4, s.raw6); + printf("UDP %-9u %-9u %-9u\n", s.udp4+s.udp6, s.udp4, s.udp6); + printf("TCP %-9u %-9u %-9u\n", s.tcp4_hashed+s.tcp6_hashed, s.tcp4_hashed, s.tcp6_hashed); + printf("INET %-9u %-9u %-9u\n", + s.raw4+s.udp4 + s.tcp4_hashed + s.raw6+s.udp6 + s.tcp6_hashed, + s.raw4+s.udp4 + s.tcp4_hashed, + s.raw6+s.udp6 + s.tcp6_hashed); + printf("FRAG %-9u %-9u %-9u\n", + s.frag4+s.frag6, s.frag4, s.frag6); printf("\n"); -- 2.16.1