From: Hangbin Liu Date: Thu, 22 Sep 2016 08:40:28 +0000 (+0800) Subject: misc/ss: tcp cwnd should be unsigned X-Git-Tag: v4.9.0~76 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1f338b31858005b2550da05098d56ea4e8fd401;p=thirdparty%2Fiproute2.git misc/ss: tcp cwnd should be unsigned tcp->snd_cwd is a u32, but ss treats it like a signed int. This may results in negative bandwidth calculations. Signed-off-by: Hangbin Liu Acked-by: Phil Sutter --- diff --git a/misc/ss.c b/misc/ss.c index 7f8453418..dd77b8153 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -755,11 +755,12 @@ struct tcpstat { int probes; char cong_alg[16]; double rto, ato, rtt, rttvar; - int qack, cwnd, ssthresh, backoff; + int qack, ssthresh, backoff; double send_bps; int snd_wscale; int rcv_wscale; int mss; + unsigned int cwnd; unsigned int lastsnd; unsigned int lastrcv; unsigned int lastack; @@ -1805,7 +1806,7 @@ static void tcp_stats_print(struct tcpstat *s) if (s->mss) printf(" mss:%d", s->mss); if (s->cwnd) - printf(" cwnd:%d", s->cwnd); + printf(" cwnd:%u", s->cwnd); if (s->ssthresh) printf(" ssthresh:%d", s->ssthresh); @@ -1924,7 +1925,7 @@ static int tcp_show_line(char *line, const struct filter *f, int family) return 0; opt[0] = 0; - n = sscanf(data, "%x %x:%x %x:%x %x %d %d %u %d %llx %d %d %d %d %d %[^\n]\n", + n = sscanf(data, "%x %x:%x %x:%x %x %d %d %u %d %llx %d %d %d %u %d %[^\n]\n", &s.ss.state, &s.ss.wq, &s.ss.rq, &s.timer, &s.timeout, &s.retrans, &s.ss.uid, &s.probes, &s.ss.ino, &s.ss.refcnt, &s.ss.sk, &rto, &ato, &s.qack, &s.cwnd,