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

Don't print stray socket addresses (-A) with the listen queue display (-L).

Browse Source 
Also, print socket's protocol with the -L.
This commit is contained in:
Ruslan Ermilov 2001-09-07 11:06:28 +00:00
parent d452f533f7
commit fb5d0fbdd7
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
usr.bin/netstat/inet.c
View File

@ -100,7 +100,7 @@ protopr(u_long proto, /* for sysctl version we pass proto # */
int istcp; int istcp;
static int first = 1; static int first = 1;
char *buf; char *buf;
const char *mibvar; const char *mibvar, *vchar;
struct tcpcb *tp = NULL; struct tcpcb *tp = NULL;
struct inpcb *inp; struct inpcb *inp;
struct xinpgen *xig, *oxig; struct xinpgen *xig, *oxig;
@ -215,8 +215,8 @@ protopr(u_long proto, /* for sysctl version we pass proto # */
if (Aflag) if (Aflag)
printf("%-8.8s ", "Socket"); printf("%-8.8s ", "Socket");
if (Lflag) if (Lflag)
printf("%-14.14s %-22.22s\n", printf("%-5.5s %-14.14s %-22.22s\n",
"Listen", "Local Address"); "Proto", "Listen", "Local Address");
else else
printf((Aflag && !Wflag) ? printf((Aflag && !Wflag) ?
"%-5.5s %-6.6s %-6.6s %-18.18s %-18.18s %s\n" : "%-5.5s %-6.6s %-6.6s %-18.18s %-18.18s %s\n" :
@ -226,34 +226,31 @@ protopr(u_long proto, /* for sysctl version we pass proto # */
"(state)"); "(state)");
first = 0; first = 0;
} }
if (Lflag && so->so_qlimit == 0)
continue;
if (Aflag) { if (Aflag) {
if (istcp) if (istcp)
printf("%8lx ", (u_long)inp->inp_ppcb); printf("%8lx ", (u_long)inp->inp_ppcb);
else else
printf("%8lx ", (u_long)so->so_pcb); printf("%8lx ", (u_long)so->so_pcb);
} }
if (Lflag)
if (so->so_qlimit) {
char buf[15];
snprintf(buf, 15, "%d/%d/%d", so->so_qlen,
so->so_incqlen, so->so_qlimit);
printf("%-14.14s ", buf);
} else
continue;
else {
const char *vchar;
#ifdef INET6 #ifdef INET6
if ((inp->inp_vflag & INP_IPV6) != 0) if ((inp->inp_vflag & INP_IPV6) != 0)
vchar = ((inp->inp_vflag & INP_IPV4) != 0)
? "46" : "6 ";
else
#endif
vchar = ((inp->inp_vflag & INP_IPV4) != 0) vchar = ((inp->inp_vflag & INP_IPV4) != 0)
? "4 " : " "; ? "46" : "6 ";
else
#endif
vchar = ((inp->inp_vflag & INP_IPV4) != 0)
? "4 " : " ";
printf("%-3.3s%-2.2s ", name, vchar);
if (Lflag) {
char buf[15];
printf("%-3.3s%-2.2s %6ld %6ld ", name, vchar, snprintf(buf, 15, "%d/%d/%d", so->so_qlen,
so->so_incqlen, so->so_qlimit);
printf("%-14.14s ", buf);
} else {
printf("%6ld %6ld ",
so->so_rcv.sb_cc, so->so_rcv.sb_cc,
so->so_snd.sb_cc); so->so_snd.sb_cc);
} }