Module Name: src
Committed By: ozaki-r
Date: Wed Sep 9 10:06:05 UTC 2015
Modified Files:
src/lib/libc/net: getaddrinfo.c
src/sbin/ping6: Makefile
Log Message:
Include several libc functions in rump.ping6
We need getaddrinfo, getifaddrs, if_indextoname and if_nametoindex
in addition to getnameinfo.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/lib/libc/net/getaddrinfo.c
cvs rdiff -u -r1.15 -r1.16 src/sbin/ping6/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/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.106 src/lib/libc/net/getaddrinfo.c:1.107
--- src/lib/libc/net/getaddrinfo.c:1.106 Sun Dec 22 02:40:48 2013
+++ src/lib/libc/net/getaddrinfo.c Wed Sep 9 10:06:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.106 2013/12/22 02:40:48 christos Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.107 2015/09/09 10:06:05 ozaki-r Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,10 +55,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.106 2013/12/22 02:40:48 christos Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.107 2015/09/09 10:06:05 ozaki-r Exp $");
#endif /* LIBC_SCCS and not lint */
+#ifndef RUMP_ACTION
#include "namespace.h"
+#endif
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
@@ -90,11 +92,13 @@ __RCSID("$NetBSD: getaddrinfo.c,v 1.106
#include "servent.h"
+#ifndef RUMP_ACTION
#ifdef __weak_alias
__weak_alias(getaddrinfo,_getaddrinfo)
__weak_alias(freeaddrinfo,_freeaddrinfo)
__weak_alias(gai_strerror,_gai_strerror)
#endif
+#endif
#define SUCCESS 0
#define ANY 0
Index: src/sbin/ping6/Makefile
diff -u src/sbin/ping6/Makefile:1.15 src/sbin/ping6/Makefile:1.16
--- src/sbin/ping6/Makefile:1.15 Thu Aug 6 14:45:54 2015
+++ src/sbin/ping6/Makefile Wed Sep 9 10:06:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/08/06 14:45:54 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.16 2015/09/09 10:06:05 ozaki-r Exp $
.include <bsd.own.mk>
@@ -16,7 +16,8 @@ LDADD+= -lipsec -lm
DPADD+= ${LIBIPSEC} ${LIBM}
.PATH: ${.CURDIR}/../../lib/libc/net
-RUMPSRCS= getnameinfo.c
+RUMPSRCS= getaddrinfo.c getifaddrs.c getnameinfo.c
+RUMPSRCS+= if_indextoname.c if_nametoindex.c
.if (${MKRUMP} != "no")
CPPFLAGS+= -DRUMP_ACTION
.endif
