From 86b3836232069126cbad3fccd52778f5adc4a676 Mon Sep 17 00:00:00 2001 From: jdp Date: Wed, 24 Jul 2002 03:02:43 +0000 Subject: Widen struct sockbuf's sb_timeo member to int from short. With non-default but reasonable values of hz this member overflowed, breaking NFS over UDP. Also, as long as I'm plowing up struct sockbuf ... Change certain members from u_long/long to u_int/int in order to reduce wasted space on 64-bit machines. This change was requested by Andrew Gallatin. Netstat and systat need to be rebuilt. I am incrementing __FreeBSD_version in case any ports need to change. --- usr.bin/systat/netstat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'usr.bin/systat') diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index 2c552ca..c3b4a3b 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -110,8 +110,8 @@ struct netinfo { long ni_lport; /* local port */ struct in_addr ni_faddr; /* foreign address */ long ni_fport; /* foreign port */ - long ni_rcvcc; /* rcv buffer character count */ - long ni_sndcc; /* snd buffer character count */ + u_int ni_rcvcc; /* rcv buffer character count */ + u_int ni_sndcc; /* snd buffer character count */ }; TAILQ_HEAD(netinfohead, netinfo) netcb = TAILQ_HEAD_INITIALIZER(netcb); @@ -450,8 +450,8 @@ shownetstat() p->ni_flags &= ~NIF_FACHG; } mvwaddstr(wnd, p->ni_line, PROTO, p->ni_proto); - mvwprintw(wnd, p->ni_line, RCVCC, "%6d", p->ni_rcvcc); - mvwprintw(wnd, p->ni_line, SNDCC, "%6d", p->ni_sndcc); + mvwprintw(wnd, p->ni_line, RCVCC, "%6u", p->ni_rcvcc); + mvwprintw(wnd, p->ni_line, SNDCC, "%6u", p->ni_sndcc); if (streq(p->ni_proto, "tcp")) { if (p->ni_state < 0 || p->ni_state >= TCP_NSTATES) mvwprintw(wnd, p->ni_line, STATE, "%d", -- cgit v1.1