Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull up following revision(s) (requested by manu in ticket #809): 

usr.bin/netstat/route.c: revision 1.84
Make sure netstat builds with -DSMALL
src/usr.bin/netstat relies on code from src/sbin/route. WHen building
with -DSMALL, some functions such as mpls_ntoa() or p_rtrmx() are not
built in src/sbin/route. We therefore have to make sure they are not
used in src/usr.bin/netstat.
This commit is contained in:
snj 2015-06-01 19:22:31 +00:00
parent 940cc8a6cc
commit 0c4cf5fe0b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: route.c,v 1.82.2.1 2015/01/08 11:01:01 martin Exp $ */
/* $NetBSD: route.c,v 1.82.2.2 2015/06/01 19:22:31 snj 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.82.2.1 2015/01/08 11:01:01 martin Exp $");
__RCSID("$NetBSD: route.c,v 1.82.2.2 2015/06/01 19:22:31 snj Exp $");
#endif
#endif /* not lint */
@ -262,6 +262,7 @@ p_krtentry(struct rtentry *rt)
printf("%6s", "-");
putchar((rt->rt_rmx.rmx_locks & RTV_MTU) ? 'L' : ' ');
if (tagflag == 1) {
#ifndef SMALL
if (rt->rt_tag != NULL) {
const struct sockaddr *tagsa = kgetsa(rt->rt_tag);
char *tagstr;
@ -276,6 +277,7 @@ p_krtentry(struct rtentry *rt)
else
printf("%7s", "-");
} else
#endif
printf("%7s", "-");
}
if (rt->rt_ifp) {
@ -287,8 +289,10 @@ p_krtentry(struct rtentry *rt)
rt->rt_nodes[0].rn_dupedkey ? " =>" : "");
}
putchar('\n');
#ifndef SMALL
if (vflag)
p_rtrmx(&rt->rt_rmx);
#endif
}
/*