matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-08-04 12:05:31 -07:00
parent 566421c8f7 aba9c23a6e
commit 0562af4a07
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
misc/ss.c
View File

@ -1059,12 +1059,25 @@ static void inet_addr_print(const inet_prefix *a, int port, unsigned int ifindex
ap = format_host(AF_INET, 4, a->data); ap = format_host(AF_INET, 4, a->data);
} }
} else { } else {
ap = format_host(a->family, 16, a->data); if (!memcmp(a->data, &in6addr_any, sizeof(in6addr_any))) {
est_len = strlen(ap); buf[0] = '*';
if (est_len <= addr_width) buf[1] = 0;
est_len = addr_width; } else {
else ap = format_host(a->family, 16, a->data);
est_len = addr_width + ((est_len-addr_width+3)/4)*4;
/* Numeric IPv6 addresses should be bracketed */
if (strchr(ap, ':')) {
snprintf(buf, sizeof(buf),
"[%s]", ap);
ap = buf;
}
est_len = strlen(ap);
if (est_len <= addr_width)
est_len = addr_width;
else
est_len = addr_width + ((est_len-addr_width+3)/4)*4;
}
} }
if (ifindex) { if (ifindex) {