diff options
| author | silby <silby@FreeBSD.org> | 2009-09-16 05:33:15 +0000 |
|---|---|---|
| committer | silby <silby@FreeBSD.org> | 2009-09-16 05:33:15 +0000 |
| commit | ded53b4033d64348edff9f7b9fe6d19d8d418ad2 (patch) | |
| tree | 2ce0381caeec3ea6ca3ab4e0629bd7cf46223a8c /usr.bin/netstat | |
| parent | 95d4e7d0750d9cb513c20c55282fbfb46b2c4a8a (diff) | |
| download | FreeBSD-src-ded53b4033d64348edff9f7b9fe6d19d8d418ad2.zip FreeBSD-src-ded53b4033d64348edff9f7b9fe6d19d8d418ad2.tar.gz | |
Add the ability to see TCP timers via netstat -x. This can be a useful
feature when you have a seemingly stuck socket and want to figure
out why it has not been closed yet.
No plans to MFC this, as it changes the netstat sysctl ABI.
Reviewed by: andre, rwatson, Eric Van Gyzen
Diffstat (limited to 'usr.bin/netstat')
| -rw-r--r-- | usr.bin/netstat/inet.c | 25 | ||||
| -rw-r--r-- | usr.bin/netstat/netstat.1 | 2 |
2 files changed, 20 insertions, 7 deletions
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 51b71c7..da07e1d 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -313,6 +313,7 @@ protopr(u_long off, const char *name, int af1, int proto) struct inpcb *inp; struct xinpgen *xig, *oxig; struct xsocket *so; + struct xtcp_timer *timer; istcp = 0; switch (proto) { @@ -347,6 +348,7 @@ protopr(u_long off, const char *name, int af1, int proto) xig->xig_len > sizeof(struct xinpgen); xig = (struct xinpgen *)((char *)xig + xig->xig_len)) { if (istcp) { + timer = &((struct xtcpcb *)xig)->xt_timer; tp = &((struct xtcpcb *)xig)->xt_tp; inp = &((struct xtcpcb *)xig)->xt_inp; so = &((struct xtcpcb *)xig)->xt_socket; @@ -414,14 +416,17 @@ protopr(u_long off, const char *name, int af1, int proto) "%-5.5s %-6.6s %-6.6s %-22.22s %-22.22s", "Proto", "Recv-Q", "Send-Q", "Local Address", "Foreign Address"); - if (xflag) - printf("%-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %s\n", + if (xflag) { + printf("%-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s ", "R-MBUF", "S-MBUF", "R-CLUS", "S-CLUS", "R-HIWA", "S-HIWA", "R-LOWA", "S-LOWA", "R-BCNT", - "S-BCNT", "R-BMAX", "S-BMAX", - "(state)"); - else + "S-BCNT", "R-BMAX", "S-BMAX"); + printf("%7.7s %7.7s %7.7s %7.7s %7.7s %7.7s %s\n", + "rexmt", "persist", "keep", + "2msl", "delack", "rcvtime", + "(state)"); + } else printf("(state)\n"); } first = 0; @@ -516,7 +521,7 @@ 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); - else + else { printf("%6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u ", so->so_rcv.sb_mcnt, so->so_snd.sb_mcnt, so->so_rcv.sb_ccnt, so->so_snd.sb_ccnt, @@ -524,6 +529,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 (istcp && !Lflag) { if (tp->t_state < 0 || tp->t_state >= TCP_NSTATES) diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index 41e15c1..cddaaaf 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -87,7 +87,7 @@ show network addresses as numbers (as with but show ports symbolically. If .Fl x -is present display full socket buffer statistics for each internet socket. +is present, display socket buffer and tcp timer statistics for each internet socket. .It Xo .Bk -words .Nm |
