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

In netstat -x, do not try to print out tcp timer status for udp sockets.

Browse Source
This commit is contained in:
Mike Silbersack 2009-09-23 05:32:33 +00:00
parent f27b147e40
commit aae0914135
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=197425
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,6 +355,7 @@ protopr(u_long off, const char *name, int af1, int proto)
} else {
inp = &((struct xinpcb *)xig)->xi_inp;
so = &((struct xinpcb *)xig)->xi_socket;
timer = NULL;
}
/* Ignore sockets for protocols other than the desired one. */
@ -425,7 +426,7 @@ protopr(u_long off, const char *name, int af1, int proto)
printf("%7.7s %7.7s %7.7s %7.7s %7.7s %7.7s %s\n",
"rexmt", "persist", "keep",
"2msl", "delack", "rcvtime",
"(state)");
"(state)");
} else
printf("(state)\n");
}
@ -529,13 +530,14 @@ protopr(u_long off, const char *name, int af1, int proto)
so->so_rcv.sb_lowat, so->so_snd.sb_lowat,
so->so_rcv.sb_mbcnt, so->so_snd.sb_mbcnt,
so->so_rcv.sb_mbmax, so->so_snd.sb_mbmax);
printf("%4d.%02d %4d.%02d %4d.%02d %4d.%02d %4d.%02d %4d.%02d ",
timer->tt_rexmt / 1000, (timer->tt_rexmt % 1000) / 10,
timer->tt_persist / 1000, (timer->tt_persist % 1000) / 10,
timer->tt_keep / 1000, (timer->tt_keep % 1000) / 10,
timer->tt_2msl / 1000, (timer->tt_2msl % 1000) / 10,
timer->tt_delack / 1000, (timer->tt_delack % 1000) / 10,
timer->t_rcvtime / 1000, (timer->t_rcvtime % 1000) / 10);
if (timer != NULL)
printf("%4d.%02d %4d.%02d %4d.%02d %4d.%02d %4d.%02d %4d.%02d ",
timer->tt_rexmt / 1000, (timer->tt_rexmt % 1000) / 10,
timer->tt_persist / 1000, (timer->tt_persist % 1000) / 10,
timer->tt_keep / 1000, (timer->tt_keep % 1000) / 10,
timer->tt_2msl / 1000, (timer->tt_2msl % 1000) / 10,
timer->tt_delack / 1000, (timer->tt_delack % 1000) / 10,
timer->t_rcvtime / 1000, (timer->t_rcvtime % 1000) / 10);
}
}
if (istcp && !Lflag) {