Flesh out <arpa/inet.h>.
Use the upstream OpenBSD implementations of these functions.
Also ensure we have symbols for htonl, htons, ntohl, and ntohs.
gtest doesn't like us using the macro versions in ASSERT_EQ.
Bug: 14840760
Change-Id: I68720e9aca14838df457d2bb27b999d5818ac2b5
diff --git a/libc/Android.mk b/libc/Android.mk
index 5befacf..6d1bcf8 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -257,7 +257,6 @@
libc_upstream_netbsd_src_files := \
upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \
- upstream-netbsd/common/lib/libc/inet/inet_addr.c \
upstream-netbsd/lib/libc/gen/ftw.c \
upstream-netbsd/lib/libc/gen/nftw.c \
upstream-netbsd/lib/libc/gen/nice.c \
@@ -266,9 +265,6 @@
upstream-netbsd/lib/libc/gen/setjmperr.c \
upstream-netbsd/lib/libc/gen/utime.c \
upstream-netbsd/lib/libc/gen/utmp.c \
- upstream-netbsd/lib/libc/inet/inet_ntoa.c \
- upstream-netbsd/lib/libc/inet/inet_ntop.c \
- upstream-netbsd/lib/libc/inet/inet_pton.c \
upstream-netbsd/lib/libc/isc/ev_streams.c \
upstream-netbsd/lib/libc/isc/ev_timers.c \
upstream-netbsd/lib/libc/regex/regcomp.c \
@@ -357,6 +353,18 @@
upstream-openbsd/lib/libc/locale/wcsxfrm.c \
upstream-openbsd/lib/libc/locale/wctob.c \
upstream-openbsd/lib/libc/locale/wctomb.c \
+ upstream-openbsd/lib/libc/net/htonl.c \
+ upstream-openbsd/lib/libc/net/htons.c \
+ upstream-openbsd/lib/libc/net/inet_addr.c \
+ upstream-openbsd/lib/libc/net/inet_lnaof.c \
+ upstream-openbsd/lib/libc/net/inet_makeaddr.c \
+ upstream-openbsd/lib/libc/net/inet_netof.c \
+ upstream-openbsd/lib/libc/net/inet_network.c \
+ upstream-openbsd/lib/libc/net/inet_ntoa.c \
+ upstream-openbsd/lib/libc/net/inet_ntop.c \
+ upstream-openbsd/lib/libc/net/inet_pton.c \
+ upstream-openbsd/lib/libc/net/ntohl.c \
+ upstream-openbsd/lib/libc/net/ntohs.c \
upstream-openbsd/lib/libc/stdio/asprintf.c \
upstream-openbsd/lib/libc/stdio/clrerr.c \
upstream-openbsd/lib/libc/stdio/fdopen.c \