Module Name: src
Committed By: ozaki-r
Date: Tue Sep 1 09:54:34 UTC 2015
Modified Files:
src/lib/libc/net: if_nametoindex.c
src/usr.sbin/ndp: Makefile
Log Message:
Fix rump.ndp -I options by rump-ifying if_nametoindex(3)
>From s-yamaguchi@IIJ
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/net/if_nametoindex.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/ndp/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/if_nametoindex.c
diff -u src/lib/libc/net/if_nametoindex.c:1.4 src/lib/libc/net/if_nametoindex.c:1.5
--- src/lib/libc/net/if_nametoindex.c:1.4 Fri Nov 24 08:21:12 2000
+++ src/lib/libc/net/if_nametoindex.c Tue Sep 1 09:54:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nametoindex.c,v 1.4 2000/11/24 08:21:12 itojun Exp $ */
+/* $NetBSD: if_nametoindex.c,v 1.5 2015/09/01 09:54:34 ozaki-r Exp $ */
/* $KAME: if_nametoindex.c,v 1.6 2000/11/24 08:18:54 itojun Exp $ */
/*-
@@ -28,10 +28,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: if_nametoindex.c,v 1.4 2000/11/24 08:21:12 itojun Exp $");
+__RCSID("$NetBSD: if_nametoindex.c,v 1.5 2015/09/01 09:54:34 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 <net/if.h>
@@ -41,9 +43,11 @@ __RCSID("$NetBSD: if_nametoindex.c,v 1.4
#include <string.h>
#include <errno.h>
+#ifndef RUMP_ACTION
#ifdef __weak_alias
__weak_alias(if_nametoindex,_if_nametoindex)
#endif
+#endif
/*
* From RFC 2553:
Index: src/usr.sbin/ndp/Makefile
diff -u src/usr.sbin/ndp/Makefile:1.10 src/usr.sbin/ndp/Makefile:1.11
--- src/usr.sbin/ndp/Makefile:1.10 Mon Aug 3 09:51:40 2015
+++ src/usr.sbin/ndp/Makefile Tue Sep 1 09:54:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/08/03 09:51:40 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.11 2015/09/01 09:54:34 ozaki-r Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ CPPFLAGS+= -DINET6
CPPFLAGS+= -I. -I${TCPDUMP}
.PATH: ${.CURDIR}/../../lib/libc/net
-RUMPSRCS= getifaddrs.c getnameinfo.c if_indextoname.c
+RUMPSRCS= getifaddrs.c getnameinfo.c if_indextoname.c if_nametoindex.c
.if (${MKRUMP} != "no")
CPPFLAGS+= -DRUMP_ACTION
.endif
