Added an inet_ntop function from BIND for systems that do not have it

  Changelog for the c-ares project

* May 14

- Added an inet_ntop function from BIND for systems that do not have it.

* April 9

- Made sortlist support IPv6 (this can probably use some testing).

ares_strerror.c ares_cancel.c ares_init.c ares_timeout.c ares_destroy.c	   \

ares_mkquery.c ares_version.c ares_expand_name.c ares_parse_a_reply.c	   \

windows_port.c ares_expand_string.c ares_parse_ptr_reply.c                 \

ares_parse_aaaa_reply.c inet_net_pton.c bitncmp.c

ares_parse_aaaa_reply.c inet_net_pton.c bitncmp.c inet_ntop.c

HHEADERS = ares.h ares_private.h setup.h ares_dns.h ares_version.h nameser.h \

           inet_net_pton.h ares_ipv6.h bitncmp.h

     ], AC_MSG_RESULT(no),AC_MSG_RESULT(no))

fi

dnl Check for inet_ntop

AC_CHECK_FUNCS(inet_ntop)

dnl Again, some systems have it, but not IPv6

if test "$ac_cv_func_inet_ntop" = "yes" ; then

AC_MSG_CHECKING(if inet_ntop supports IPv6)

AC_TRY_RUN(

  [

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#ifdef HAVE_WINSOCK_H

#include <winsock.h>

#endif

#ifdef HAVE_NETINET_IN_H

#include <netinet/in.h>

#endif

#include <errno.h>

int main()

  {

    struct in6_addr addr6;

    char buf[128];

    if (inet_ntop(AF_INET6, &addr6, buf, 128) == 0 && errno == EAFNOSUPPORT)

      exit(1);

    else

      exit(0);

  }

  ], [

       AC_MSG_RESULT(yes)

       AC_DEFINE_UNQUOTED(HAVE_INET_NTOP_IPV6,1,[Define to 1 if inet_ntop supports IPv6.])

     ], AC_MSG_RESULT(no),AC_MSG_RESULT(no))

fi

AC_CHECK_SIZEOF(struct in6_addr, ,

[

#ifdef HAVE_SYS_TYPES_H

/* Copyright (c) 1996 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS

 * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES

 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE

 * CONSORTIUM 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 "setup.h"

#include <sys/types.h>

#if defined(WIN32) && !defined(WATT32)

#include "nameser.h"

#else

#ifdef HAVE_SYS_SOCKET_H

#include <sys/socket.h>

#endif

#ifdef HAVE_NETINET_IN_H

#include <netinet/in.h>

#endif

#ifdef HAVE_ARPA_NAMESER_H

#include <arpa/nameser.h>

#endif

#ifdef HAVE_ARPA_INET_H

#include <arpa/inet.h>

#endif

#endif

#include <ctype.h>

#include <errno.h>

#include <stdio.h>

#include <string.h>

#include <stdlib.h>

#include "ares_ipv6.h"

#include "inet_ntop.h"

#if !defined(HAVE_INET_NTOP) || !defined(HAVE_INET_NTOP_IPV6)

#ifdef SPRINTF_CHAR

# define SPRINTF(x) strlen(sprintf/**/x)

#else

# define SPRINTF(x) ((size_t)sprintf x)

#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 unsigned char *src, char *dst, size_t size);

static const char *inet_ntop6(const unsigned char *src, char *dst, size_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, size_t size)

{

	switch (af) {

	case AF_INET:

		return (inet_ntop4(src, dst, size));

#ifdef INET6

	case AF_INET6:

		return (inet_ntop6(src, dst, size));

#endif

	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 unsigned char* not an in_addr as input

 * author:

 *	Paul Vixie, 1996.

 */

static const char *

inet_ntop4(const unsigned char *src, char *dst, size_t size)

{

	static const char fmt[] = "%u.%u.%u.%u";

	char tmp[sizeof "255.255.255.255"];

	if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) {

		errno = ENOSPC;

		return (NULL);

	}

	strcpy(dst, tmp);

	return (dst);

}

#ifdef INET6

/* 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 unsigned char *src, char *dst, size_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"], *tp;

	struct { int base, len; } best, cur;

	unsigned int words[IN6ADDRSZ / INT16SZ];

	int i;

	/*

	 * 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 < IN6ADDRSZ; i++)

		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));

	best.base = -1;

	cur.base = -1;

	for (i = 0; i < (IN6ADDRSZ / 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;

	for (i = 0; i < (IN6ADDRSZ / 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)

			*tp++ = ':';

		/* Is this address an encapsulated IPv4? */

		if (i == 6 && best.base == 0 &&

		    (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {

			if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))

				return (NULL);

			tp += strlen(tp);

			break;

		}

		tp += SPRINTF((tp, "%x", words[i]));

	}

	/* Was it a trailing run of 0x00's? */

	if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ))

		*tp++ = ':';

	*tp++ = '\0';

	/*

	 * Check for overflow, copy, and we're done.

	 */

	if ((size_t)(tp - tmp) > size) {

		errno = ENOSPC;

		return (NULL);

	}

	strcpy(dst, tmp);

	return (dst);

}

#endif

#endif

/* $Id$ */

/*

 * Permission to use, copy, modify, and distribute this

 * software and its documentation for any purpose and without

 * fee is hereby granted, provided that the above copyright

 * notice appear in all copies and that both that copyright

 * notice and this permission notice appear in supporting

 * documentation, and that the name of M.I.T. not be used in

 * advertising or publicity pertaining to distribution of the

 * software without specific, written prior permission.

 * M.I.T. makes no representations about the suitability of

 * this software for any purpose.  It is provided "as is"

 * without express or implied warranty.

 */

#ifndef INET_NTOP_H

#define INET_NTOP_H

#ifdef HAVE_INET_NTOP

#define ares_inet_ntop(w,x,y,z) inet_ntop(w,x,y,z)

#else

const char *ares_inet_ntop(int af, const void *src, char *dst, size_t size);

#endif

#endif /* INET_NET_NTOP_H */