d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify printaddr(). No functional change.

Browse Source 
MFC after: 3 days
This commit is contained in:
Michael Tuexen 2015-06-13 19:56:04 +00:00
parent 4c46adf174
commit baa7f281a3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=284351
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/sockstat/sockstat.c
View File

@ -496,14 +496,14 @@ getfiles(void)
} }
static int static int
printaddr(int af, struct sockaddr_storage *ss) printaddr(struct sockaddr_storage *ss)
{ {
char addrstr[INET6_ADDRSTRLEN] = { '\0', '\0' }; char addrstr[INET6_ADDRSTRLEN] = { '\0', '\0' };
struct sockaddr_un *sun; struct sockaddr_un *sun;
void *addr = NULL; /* Keep compiler happy. */ void *addr = NULL; /* Keep compiler happy. */
int off, port = 0; int off, port = 0;
switch (af) { switch (ss->ss_family) {
case AF_INET: case AF_INET:
addr = &((struct sockaddr_in *)ss)->sin_addr; addr = &((struct sockaddr_in *)ss)->sin_addr;
if (inet_lnaof(*(struct in_addr *)addr) == INADDR_ANY) if (inet_lnaof(*(struct in_addr *)addr) == INADDR_ANY)
@ -522,7 +522,7 @@ printaddr(int af, struct sockaddr_storage *ss)
return (xprintf("%.*s", sun->sun_len - off, sun->sun_path)); return (xprintf("%.*s", sun->sun_len - off, sun->sun_path));
} }
if (addrstr[0] == '\0') if (addrstr[0] == '\0')
inet_ntop(af, addr, addrstr, sizeof addrstr); inet_ntop(ss->ss_family, addr, addrstr, sizeof addrstr);
if (port == 0) if (port == 0)
return xprintf("%s:*", addrstr); return xprintf("%s:*", addrstr);
else else
@ -613,17 +613,17 @@ displaysock(struct sock *s, int pos)
switch (s->family) { switch (s->family) {
case AF_INET: case AF_INET:
case AF_INET6: case AF_INET6:
pos += printaddr(s->family, &s->laddr); pos += printaddr(&s->laddr);
if (s->family == AF_INET6 && pos >= 58) if (s->family == AF_INET6 && pos >= 58)
pos += xprintf(" "); pos += xprintf(" ");
while (pos < 58) while (pos < 58)
pos += xprintf(" "); pos += xprintf(" ");
pos += printaddr(s->family, &s->faddr); pos += printaddr(&s->faddr);
break; break;
case AF_UNIX: case AF_UNIX:
/* server */ /* server */
if (s->laddr.ss_len > 0) { if (s->laddr.ss_len > 0) {
pos += printaddr(s->family, &s->laddr); pos += printaddr(&s->laddr);
break; break;
} }
/* client */ /* client */
@ -643,7 +643,7 @@ displaysock(struct sock *s, int pos)
if (s == NULL || s->laddr.ss_len == 0) if (s == NULL || s->laddr.ss_len == 0)
pos += xprintf("??"); pos += xprintf("??");
else else
pos += printaddr(s->family, &s->laddr); pos += printaddr(&s->laddr);
break; break;
default: default:
abort(); abort();