Module Name: src
Committed By: ozaki-r
Date: Fri May 15 06:58:59 UTC 2015
Modified Files:
src/lib/libc/net: getnameinfo.c
src/sbin/route: Makefile
src/usr.bin/netstat: Makefile
Log Message:
Fix rump.{netstat,route} shows host's interface names in link local addresses
Interface names of IPv6 link local addresses are resolved
by getnameinfo(3). So we need to rump-ify it as well as
if_indextoname and getifaddrs.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/lib/libc/net/getnameinfo.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/route/Makefile
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/netstat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getnameinfo.c
diff -u src/lib/libc/net/getnameinfo.c:1.54 src/lib/libc/net/getnameinfo.c:1.55
--- src/lib/libc/net/getnameinfo.c:1.54 Fri Aug 16 15:27:12 2013
+++ src/lib/libc/net/getnameinfo.c Fri May 15 06:58:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: getnameinfo.c,v 1.54 2013/08/16 15:27:12 christos Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.55 2015/05/15 06:58:59 ozaki-r Exp $ */
/* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */
/*
@@ -47,10 +47,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnameinfo.c,v 1.54 2013/08/16 15:27:12 christos Exp $");
+__RCSID("$NetBSD: getnameinfo.c,v 1.55 2015/05/15 06:58:59 ozaki-r Exp $");
#endif /* LIBC_SCCS and not lint */
+#ifndef RUMP_ACTION
#include "namespace.h"
+#endif
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
Index: src/sbin/route/Makefile
diff -u src/sbin/route/Makefile:1.27 src/sbin/route/Makefile:1.28
--- src/sbin/route/Makefile:1.27 Wed Apr 22 03:07:55 2015
+++ src/sbin/route/Makefile Fri May 15 06:58:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/04/22 03:07:55 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.28 2015/05/15 06:58:59 ozaki-r Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ MAN= route.8
SRCS= route.c show.c keywords.c rtutil.c
.PATH: ${.CURDIR}/../../lib/libc/net
-RUMPSRCS= if_indextoname.c getifaddrs.c
+RUMPSRCS= if_indextoname.c getifaddrs.c getnameinfo.c
.if (${MKRUMP} != "no")
CPPFLAGS+= -DRUMP_ACTION
.endif
Index: src/usr.bin/netstat/Makefile
diff -u src/usr.bin/netstat/Makefile:1.41 src/usr.bin/netstat/Makefile:1.42
--- src/usr.bin/netstat/Makefile:1.41 Sat Feb 7 19:36:06 2015
+++ src/usr.bin/netstat/Makefile Fri May 15 06:58:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2015/02/07 19:36:06 christos Exp $
+# $NetBSD: Makefile,v 1.42 2015/05/15 06:58:59 ozaki-r Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -25,7 +25,7 @@ COPTS.show.c += -Wno-format-nonliteral
.PATH: ${.CURDIR}/../../sbin/route
CPPFLAGS+= -DRUMP_ACTION
RUMPSRCS+= sysctlbyname.c sysctlgetmibinfo.c sysctlnametomib.c
-RUMPSRCS+= if_indextoname.c getifaddrs.c
+RUMPSRCS+= if_indextoname.c getifaddrs.c getnameinfo.c
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
