diff --git a/libc/Android.mk b/libc/Android.mk index caf0bac4c..bfecbbccb 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -271,7 +271,6 @@ libc_upstream_netbsd_src_files := \ 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_ntop.c \ upstream-netbsd/lib/libc/isc/ev_streams.c \ upstream-netbsd/lib/libc/isc/ev_timers.c \ upstream-netbsd/lib/libc/regex/regcomp.c \ @@ -367,6 +366,7 @@ libc_upstream_openbsd_src_files := \ 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 \ diff --git a/libc/upstream-netbsd/lib/libc/inet/inet_ntop.c b/libc/upstream-netbsd/lib/libc/inet/inet_ntop.c deleted file mode 100644 index d27a5b150..000000000 --- a/libc/upstream-netbsd/lib/libc/inet/inet_ntop.c +++ /dev/null @@ -1,231 +0,0 @@ -/* $NetBSD: inet_ntop.c,v 1.11 2014/02/10 16:30:54 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996-1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static const char rcsid[] = "Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 marka Exp"; -#else -__RCSID("$NetBSD: inet_ntop.c,v 1.11 2014/02/10 16:30:54 christos Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include "port_before.h" - -#include "namespace.h" -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "port_after.h" - -#ifdef __weak_alias -__weak_alias(inet_ntop,_inet_ntop) -#endif - -/*% - * WARNING: Don't even consider trying to compile this on a system where - * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. - */ - -static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size); -static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size); - -/* char * - * inet_ntop(af, src, dst, size) - * convert a network format address to presentation format. - * return: - * pointer to presentation format address (`dst'), or NULL (see errno). - * author: - * Paul Vixie, 1996. - */ -const char * -inet_ntop(int af, const void *src, char *dst, socklen_t size) -{ - - _DIAGASSERT(src != NULL); - _DIAGASSERT(dst != NULL); - - switch (af) { - case AF_INET: - return inet_ntop4(src, dst, size); - case AF_INET6: - return inet_ntop6(src, dst, size); - default: - errno = EAFNOSUPPORT; - return NULL; - } - /* NOTREACHED */ -} - -/* const char * - * inet_ntop4(src, dst, size) - * format an IPv4 address, more or less like inet_ntoa() - * return: - * `dst' (as a const) - * notes: - * (1) uses no statics - * (2) takes a u_char* not an in_addr as input - * author: - * Paul Vixie, 1996. - */ -static const char * -inet_ntop4(const u_char *src, char *dst, socklen_t size) -{ - char tmp[sizeof "255.255.255.255"]; - int l; - - _DIAGASSERT(src != NULL); - _DIAGASSERT(dst != NULL); - - l = snprintf(tmp, sizeof(tmp), "%u.%u.%u.%u", - src[0], src[1], src[2], src[3]); - if (l <= 0 || (socklen_t) l >= size) - return NULL; - strlcpy(dst, tmp, size); - return dst; -} - -/* const char * - * inet_ntop6(src, dst, size) - * convert IPv6 binary address into presentation (printable) format - * author: - * Paul Vixie, 1996. - */ -static const char * -inet_ntop6(const u_char *src, char *dst, socklen_t size) -{ - /* - * Note that int32_t and int16_t need only be "at least" large enough - * to contain a value of the specified size. On some systems, like - * Crays, there is no such thing as an integer variable with 16 bits. - * Keep this in mind if you think this function should have been coded - * to use pointer overlays. All the world's not a VAX. - */ - char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"]; - char *tp, *ep; - struct { int base, len; } best, cur; - u_int words[NS_IN6ADDRSZ / NS_INT16SZ]; - int i; - int advance; - - _DIAGASSERT(src != NULL); - _DIAGASSERT(dst != NULL); - - /* - * Preprocess: - * Copy the input (bytewise) array into a wordwise array. - * Find the longest run of 0x00's in src[] for :: shorthanding. - */ - memset(words, '\0', sizeof words); - for (i = 0; i < NS_IN6ADDRSZ; i++) - words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); - best.base = -1; - best.len = 0; - cur.base = -1; - cur.len = 0; - for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { - if (words[i] == 0) { - if (cur.base == -1) - cur.base = i, cur.len = 1; - else - cur.len++; - } else { - if (cur.base != -1) { - if (best.base == -1 || cur.len > best.len) - best = cur; - cur.base = -1; - } - } - } - if (cur.base != -1) { - if (best.base == -1 || cur.len > best.len) - best = cur; - } - if (best.base != -1 && best.len < 2) - best.base = -1; - - /* - * Format the result. - */ - tp = tmp; - ep = tmp + sizeof(tmp); - for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { - /* Are we inside the best run of 0x00's? */ - if (best.base != -1 && i >= best.base && - i < (best.base + best.len)) { - if (i == best.base) - *tp++ = ':'; - continue; - } - /* Are we following an initial run of 0x00s or any real hex? */ - if (i != 0) { - if (tp + 1 >= ep) - goto out; - *tp++ = ':'; - } - /* Is this address an encapsulated IPv4? */ - if (i == 6 && best.base == 0 && - (best.len == 6 || - (best.len == 7 && words[7] != 0x0001) || - (best.len == 5 && words[5] == 0xffff))) { - if (!inet_ntop4(src + 12, tp, (socklen_t)(ep - tp))) - goto out; - tp += strlen(tp); - break; - } - advance = snprintf(tp, (size_t)(ep - tp), "%x", words[i]); - if (advance <= 0 || advance >= ep - tp) - goto out; - tp += advance; - } - /* Was it a trailing run of 0x00's? */ - if (best.base != -1 && (best.base + best.len) == - (NS_IN6ADDRSZ / NS_INT16SZ)) { - if (tp + 1 >= ep) - goto out; - *tp++ = ':'; - } - if (tp + 1 >= ep) - goto out; - *tp++ = '\0'; - - /* - * Check for overflow, copy, and we're done. - */ - if ((size_t)(tp - tmp) > size) - goto out; - strlcpy(dst, tmp, size); - return dst; -out: - errno = ENOSPC; - return NULL; -} - -/*! \file */ diff --git a/libc/upstream-openbsd/lib/libc/net/inet_ntop.c b/libc/upstream-openbsd/lib/libc/net/inet_ntop.c index 359acd8cd..f991a071b 100644 --- a/libc/upstream-openbsd/lib/libc/net/inet_ntop.c +++ b/libc/upstream-openbsd/lib/libc/net/inet_ntop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_ntop.c,v 1.9 2014/02/05 14:20:43 millert Exp $ */ +/* $OpenBSD: inet_ntop.c,v 1.10 2014/05/17 18:16:14 tedu Exp $ */ /* Copyright (c) 1996 by Internet Software Consortium. * @@ -71,11 +71,11 @@ inet_ntop(int af, const void *src, char *dst, socklen_t size) static const char * inet_ntop4(const u_char *src, char *dst, size_t size) { - static const char fmt[] = "%u.%u.%u.%u"; char tmp[sizeof "255.255.255.255"]; int l; - l = snprintf(tmp, size, fmt, src[0], src[1], src[2], src[3]); + l = snprintf(tmp, sizeof(tmp), "%u.%u.%u.%u", + src[0], src[1], src[2], src[3]); if (l <= 0 || l >= size) { errno = ENOSPC; return (NULL);