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

Minimize changes CURRENT<->releng7.

Browse Source
This commit is contained in:
David E. O'Brien 2008-09-01 15:04:38 +00:00
parent d08cd9468b
commit dd335a1577
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=182602
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,8 +415,8 @@ protopr(u_long off, const char *name, int af1, int proto)
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",
"R-MBUF", "S-MBUF", "R-CLUS", "S-CLUS",
"R-HIWA", "S-HIWA", "R-LOWA", "S-LOWA",
"R-BCNT", "S-BCNT", "R-BMAX", "S-BMAX",
"R-HIWA", "S-HIWA", "R-LOWA", "S-LOWA",
"R-BCNT", "S-BCNT", "R-BMAX", "S-BMAX",
"(state)");
else
printf("(state)\n");
@ -446,8 +446,7 @@ protopr(u_long off, const char *name, int af1, int proto)
so->so_incqlen, so->so_qlimit);
printf("%-14.14s ", buf1);
} else {
printf("%6u %6u ",
so->so_rcv.sb_cc, so->so_snd.sb_cc);
printf("%6u %6u ", so->so_rcv.sb_cc, so->so_snd.sb_cc);
}
if (numeric_port) {
if (inp->inp_vflag & INP_IPV4) {
@ -505,7 +504,7 @@ protopr(u_long off, const char *name, int af1, int proto)
}
if (xflag) {
if (Lflag)
printf("%21s %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u %6u ",
printf("%21s %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,

2
usr.bin/netstat/main.c
View File

@ -331,7 +331,7 @@ int rflag; /* show routing tables (or routing stats) */
int sflag; /* show protocol statistics */
int tflag; /* show i/f watchdog timers */
int Wflag; /* wide display */
int xflag; /* extra information, includes all socket buffer info */
int xflag; /* extra information, includes all socket buffer info */
int zflag; /* zero stats */
int interval; /* repeat interval for i/f stats */

2
usr.bin/netstat/netstat.h
View File

@ -51,7 +51,7 @@ extern int rflag; /* show routing tables (or routing stats) */
extern int sflag; /* show protocol statistics */
extern int tflag; /* show i/f watchdog timers */
extern int Wflag; /* wide display */
extern int xflag; /* extended display, includes all socket buffer info */
extern int xflag; /* extended display, includes all socket buffer info */
extern int zflag; /* zero stats */
extern int interval; /* repeat interval for i/f stats */

4
usr.bin/netstat/route.c
View File

@ -137,7 +137,7 @@ static void ntreestuff(void);
static void np_rtentry(struct rt_msghdr *);
static void p_sockaddr(struct sockaddr *, struct sockaddr *, int, int);
static const char *fmt_sockaddr(struct sockaddr *sa, struct sockaddr *mask,
int flags);
int flags);
static void p_flags(int, const char *);
static const char *fmt_flags(int f);
static void p_rtentry(struct rtentry *);
@ -150,9 +150,9 @@ void
routepr(u_long rtree)
{
struct radix_node_head *rnh, head;
size_t intsize;
int i;
int numfibs;
size_t intsize;
intsize = sizeof(int);
if (sysctlbyname("net.my_fibnum", &fibnum, &intsize, NULL, 0) == -1)