Module Name: src
Committed By: christos
Date: Mon Apr 28 15:41:15 UTC 2014
Modified Files:
src/usr.bin/netstat: main.c netstat.h route.c show.c
Log Message:
use the same for the route metrics part, both in the sysctl and kmem paths.
>From Takahiro HAYASHI
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/netstat/netstat.h
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/netstat/route.c
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/netstat/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/netstat/main.c
diff -u src/usr.bin/netstat/main.c:1.89 src/usr.bin/netstat/main.c:1.90
--- src/usr.bin/netstat/main.c:1.89 Thu Apr 24 10:56:29 2014
+++ src/usr.bin/netstat/main.c Mon Apr 28 11:41:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.89 2014/04/24 14:56:29 christos Exp $ */
+/* $NetBSD: main.c,v 1.90 2014/04/28 15:41:15 christos Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "from: @(#)main.c 8.4 (Berkeley) 3/1/94";
#else
-__RCSID("$NetBSD: main.c,v 1.89 2014/04/24 14:56:29 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.90 2014/04/28 15:41:15 christos Exp $");
#endif
#endif /* not lint */
@@ -356,7 +356,6 @@ prepare(const char *nf, const char *mf,
#ifndef SMALL
gflag ||
#endif
- (rflag && vflag) ||
(pflag && tp->pr_sindex == N_PIMSTAT) ||
Pflag) {
/* These flags are not yet supported via sysctl(3). */
Index: src/usr.bin/netstat/netstat.h
diff -u src/usr.bin/netstat/netstat.h:1.49 src/usr.bin/netstat/netstat.h:1.50
--- src/usr.bin/netstat/netstat.h:1.49 Thu Apr 24 10:54:51 2014
+++ src/usr.bin/netstat/netstat.h Mon Apr 28 11:41:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netstat.h,v 1.49 2014/04/24 14:54:51 christos Exp $ */
+/* $NetBSD: netstat.h,v 1.50 2014/04/28 15:41:15 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -116,6 +116,8 @@ void impstats(u_long, u_long);
void pr_rthdr(int, int);
void pr_family(int);
+struct rt_metrics;
+void pr_rtrmx(struct rt_metrics *);
void rt_stats(u_long);
char *ns_phost(struct sockaddr *);
Index: src/usr.bin/netstat/route.c
diff -u src/usr.bin/netstat/route.c:1.81 src/usr.bin/netstat/route.c:1.82
--- src/usr.bin/netstat/route.c:1.81 Thu Apr 24 10:56:29 2014
+++ src/usr.bin/netstat/route.c Mon Apr 28 11:41:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.81 2014/04/24 14:56:29 christos Exp $ */
+/* $NetBSD: route.c,v 1.82 2014/04/28 15:41:15 christos Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94";
#else
-__RCSID("$NetBSD: route.c,v 1.81 2014/04/24 14:56:29 christos Exp $");
+__RCSID("$NetBSD: route.c,v 1.82 2014/04/28 15:41:15 christos Exp $");
#endif
#endif /* not lint */
@@ -286,27 +286,26 @@ p_krtentry(struct rtentry *rt)
rt->rt_nodes[0].rn_dupedkey ? " =>" : "");
}
putchar('\n');
- if (vflag) {
- printf("\texpire %10"PRId64"%c recvpipe %10"PRIu64"%c "
- "sendpipe %10"PRIu64"%c\n",
- (int64_t)rt->rt_rmx.rmx_expire,
- (rt->rt_rmx.rmx_locks & RTV_EXPIRE) ? 'L' : ' ',
- rt->rt_rmx.rmx_recvpipe,
- (rt->rt_rmx.rmx_locks & RTV_RPIPE) ? 'L' : ' ',
- rt->rt_rmx.rmx_sendpipe,
- (rt->rt_rmx.rmx_locks & RTV_SPIPE) ? 'L' : ' ');
- printf("\tssthresh %10"PRIu64"%c rtt %10"PRIu64"%c "
- "rttvar %10"PRIu64"%c\n",
- rt->rt_rmx.rmx_ssthresh,
- (rt->rt_rmx.rmx_locks & RTV_SSTHRESH) ? 'L' : ' ',
- rt->rt_rmx.rmx_rtt,
- (rt->rt_rmx.rmx_locks & RTV_RTT) ? 'L' : ' ',
- rt->rt_rmx.rmx_rttvar,
- (rt->rt_rmx.rmx_locks & RTV_RTTVAR) ? 'L' : ' ');
- printf("\thopcount %10"PRIu64"%c\n",
- rt->rt_rmx.rmx_hopcount,
- (rt->rt_rmx.rmx_locks & RTV_HOPCOUNT) ? 'L' : ' ');
- }
+ if (vflag)
+ pr_rtrmx(&rt->rt_rmx);
+}
+
+void
+pr_rtrmx(struct rt_metrics *rmx)
+{
+ printf("\texpire %10"PRId64"%c recvpipe %10"PRIu64"%c "
+ "sendpipe %10"PRIu64"%c\n",
+ (int64_t)rmx->rmx_expire,
+ (rmx->rmx_locks & RTV_EXPIRE) ? 'L' : ' ', rmx->rmx_recvpipe,
+ (rmx->rmx_locks & RTV_RPIPE) ? 'L' : ' ', rmx->rmx_sendpipe,
+ (rmx->rmx_locks & RTV_SPIPE) ? 'L' : ' ');
+ printf("\tssthresh %10"PRIu64"%c rtt %10"PRIu64"%c "
+ "rttvar %10"PRIu64"%c\n", rmx->rmx_ssthresh,
+ (rmx->rmx_locks & RTV_SSTHRESH) ? 'L' : ' ',
+ rmx->rmx_rtt, (rmx->rmx_locks & RTV_RTT) ? 'L' : ' ',
+ rmx->rmx_rttvar, (rmx->rmx_locks & RTV_RTTVAR) ? 'L' : ' ');
+ printf("\thopcount %10"PRIu64"%c\n",
+ rmx->rmx_hopcount, (rmx->rmx_locks & RTV_HOPCOUNT) ? 'L' : ' ');
}
/*
Index: src/usr.bin/netstat/show.c
diff -u src/usr.bin/netstat/show.c:1.18 src/usr.bin/netstat/show.c:1.19
--- src/usr.bin/netstat/show.c:1.18 Sat Oct 19 11:56:06 2013
+++ src/usr.bin/netstat/show.c Mon Apr 28 11:41:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: show.c,v 1.18 2013/10/19 15:56:06 christos Exp $ */
+/* $NetBSD: show.c,v 1.19 2014/04/28 15:41:15 christos Exp $ */
/* $OpenBSD: show.c,v 1.1 2006/05/27 19:16:37 claudio Exp $ */
/*
@@ -273,6 +273,8 @@ p_rtentry(struct rt_msghdr *rtm)
p_tag(rti_info[RTAX_TAG]);
printf(" %.16s", if_indextoname(rtm->rtm_index, ifbuf));
putchar('\n');
+ if (vflag)
+ pr_rtrmx(&rtm->rtm_rmx);
}
/*
