1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 15:48:49 -05:00

Added CVS id, Detabified, applied c-ares coding-style.

This commit is contained in:
Gisle Vanem 2005-11-12 14:59:33 +00:00
parent ec65c3fd53
commit b09d5c3135

View File

@ -1,3 +1,5 @@
/* $Id$ */
/* Copyright (c) 1996 by Internet Software Consortium. /* Copyright (c) 1996 by Internet Software Consortium.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -63,144 +65,156 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size);
/* char * /* char *
* inet_ntop(af, src, dst, size) * inet_ntop(af, src, dst, size)
* convert a network format address to presentation format. * convert a network format address to presentation format.
* return: * return:
* pointer to presentation format address (`dst'), or NULL (see errno). * pointer to presentation format address (`dst'), or NULL (see errno).
* author: * author:
* Paul Vixie, 1996. * Paul Vixie, 1996.
*/ */
const char * const char *
ares_inet_ntop(int af, const void *src, char *dst, size_t size) ares_inet_ntop(int af, const void *src, char *dst, size_t size)
{ {
switch (af)
switch (af) { {
case AF_INET: case AF_INET:
return (inet_ntop4(src, dst, size)); return (inet_ntop4(src, dst, size));
case AF_INET6: case AF_INET6:
return (inet_ntop6(src, dst, size)); return (inet_ntop6(src, dst, size));
default: default:
errno = EAFNOSUPPORT; errno = EAFNOSUPPORT;
return (NULL); return (NULL);
} }
/* NOTREACHED */ /* NOTREACHED */
} }
/* const char * /* const char *
* inet_ntop4(src, dst, size) * inet_ntop4(src, dst, size)
* format an IPv4 address, more or less like inet_ntoa() * format an IPv4 address, more or less like inet_ntoa()
* return: * return:
* `dst' (as a const) * `dst' (as a const)
* notes: * notes:
* (1) uses no statics * (1) uses no statics
* (2) takes a unsigned char* not an in_addr as input * (2) takes a unsigned char* not an in_addr as input
* author: * author:
* Paul Vixie, 1996. * Paul Vixie, 1996.
*/ */
static const char * static const char *
inet_ntop4(const unsigned char *src, char *dst, size_t size) inet_ntop4(const unsigned char *src, char *dst, size_t size)
{ {
static const char fmt[] = "%u.%u.%u.%u"; static const char fmt[] = "%u.%u.%u.%u";
char tmp[sizeof "255.255.255.255"]; char tmp[sizeof "255.255.255.255"];
if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) { if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size)
errno = ENOSPC; {
return (NULL); errno = ENOSPC;
} return (NULL);
strcpy(dst, tmp); }
return (dst); strcpy(dst, tmp);
return (dst);
} }
/* const char * /* const char *
* inet_ntop6(src, dst, size) * inet_ntop6(src, dst, size)
* convert IPv6 binary address into presentation (printable) format * convert IPv6 binary address into presentation (printable) format
* author: * author:
* Paul Vixie, 1996. * Paul Vixie, 1996.
*/ */
static const char * static const char *
inet_ntop6(const unsigned char *src, char *dst, size_t size) 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 * 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 * 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. * 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 * Keep this in mind if you think this function should have been coded
* to use pointer overlays. All the world's not a VAX. * 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; char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
struct { int base, len; } best = { 0,0 }, cur = { 0,0 }; struct { int base, len; } best = { 0,0 }, cur = { 0,0 };
unsigned int words[NS_IN6ADDRSZ / NS_INT16SZ]; unsigned int words[NS_IN6ADDRSZ / NS_INT16SZ];
int i; int i;
/* /*
* Preprocess: * Preprocess:
* Copy the input (bytewise) array into a wordwise array. * Copy the input (bytewise) array into a wordwise array.
* Find the longest run of 0x00's in src[] for :: shorthanding. * Find the longest run of 0x00's in src[] for :: shorthanding.
*/ */
memset(words, '\0', sizeof words); memset(words, '\0', sizeof words);
for (i = 0; i < NS_IN6ADDRSZ; i++) for (i = 0; i < NS_IN6ADDRSZ; i++)
words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
best.base = -1; best.base = -1;
cur.base = -1; cur.base = -1;
for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
if (words[i] == 0) { {
if (cur.base == -1) if (words[i] == 0)
cur.base = i, cur.len = 1; {
else if (cur.base == -1)
cur.len++; cur.base = i, cur.len = 1;
} else { else
if (cur.base != -1) { cur.len++;
if (best.base == -1 || cur.len > best.len) }
best = cur; else
cur.base = -1; {
} if (cur.base != -1)
} {
} if (best.base == -1 || cur.len > best.len)
if (cur.base != -1) { best = cur;
if (best.base == -1 || cur.len > best.len) cur.base = -1;
best = cur; }
} }
if (best.base != -1 && best.len < 2) }
best.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. * Format the result.
*/ */
tp = tmp; tp = tmp;
for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { 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 && /* Are we inside the best run of 0x00's? */
i < (best.base + best.len)) { if (best.base != -1 && i >= best.base &&
if (i == best.base) i < (best.base + best.len))
*tp++ = ':'; {
continue; if (i == best.base)
} *tp++ = ':';
/* Are we following an initial run of 0x00s or any real hex? */ continue;
if (i != 0) }
*tp++ = ':'; /* Are we following an initial run of 0x00s or any real hex? */
/* Is this address an encapsulated IPv4? */ if (i != 0)
if (i == 6 && best.base == 0 && *tp++ = ':';
(best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { /* Is this address an encapsulated IPv4? */
if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) if (i == 6 && best.base == 0 &&
return (NULL); (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
tp += strlen(tp); {
break; if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
} return (NULL);
tp += SPRINTF((tp, "%x", words[i])); tp += strlen(tp);
} break;
/* Was it a trailing run of 0x00's? */ }
if (best.base != -1 && (best.base + best.len) == (NS_IN6ADDRSZ / NS_INT16SZ)) tp += SPRINTF((tp, "%x", words[i]));
*tp++ = ':'; }
*tp++ = '\0';
/* /* Was it a trailing run of 0x00's? */
* Check for overflow, copy, and we're done. if (best.base != -1 && (best.base + best.len) == (NS_IN6ADDRSZ / NS_INT16SZ))
*/ *tp++ = ':';
if ((size_t)(tp - tmp) > size) { *tp++ = '\0';
errno = ENOSPC;
return (NULL); /*
} * Check for overflow, copy, and we're done.
strcpy(dst, tmp); */
return (dst); if ((size_t)(tp - tmp) > size)
{
errno = ENOSPC;
return (NULL);
}
strcpy(dst, tmp);
return (dst);
} }
#endif #endif