diff options
| author | peter <peter@FreeBSD.org> | 1998-06-11 09:03:02 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-06-11 09:03:02 +0000 |
| commit | 9492d9f3a276bb1ce288f7f1242f55ba381fb5d8 (patch) | |
| tree | 1fedca6b8adcc385c524308ec3d4040f66de30c6 /lib/libc/net/inet_ntop.c | |
| parent | a17a83618dae26baf5445f202b4ed0ce247b3f86 (diff) | |
| download | FreeBSD-src-9492d9f3a276bb1ce288f7f1242f55ba381fb5d8.zip FreeBSD-src-9492d9f3a276bb1ce288f7f1242f55ba381fb5d8.tar.gz | |
Update the resolver parts to bind-8.1.2 level. I have not touched the
getXXXXbyYYYY() interfaces yet.
Obtained from: diff relative to bind-8.1.2 sources
Diffstat (limited to 'lib/libc/net/inet_ntop.c')
| -rw-r--r-- | lib/libc/net/inet_ntop.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/libc/net/inet_ntop.c b/lib/libc/net/inet_ntop.c index 36dcb32..c44a973 100644 --- a/lib/libc/net/inet_ntop.c +++ b/lib/libc/net/inet_ntop.c @@ -15,7 +15,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$Id$"; +static char rcsid[] = "$Id: inet_ntop.c,v 1.3 1997/02/22 15:00:21 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -24,9 +24,9 @@ static char rcsid[] = "$Id$"; #include <netinet/in.h> #include <arpa/inet.h> #include <arpa/nameser.h> -#include <string.h> #include <errno.h> #include <stdio.h> +#include <string.h> #define SPRINTF(x) ((size_t)sprintf x) @@ -114,7 +114,7 @@ inet_ntop6(src, dst, size) */ char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; struct { int base, len; } best, cur; - u_int words[IN6ADDRSZ / INT16SZ]; + u_int words[NS_IN6ADDRSZ / NS_INT16SZ]; int i; /* @@ -123,11 +123,11 @@ inet_ntop6(src, dst, size) * Find the longest run of 0x00's in src[] for :: shorthanding. */ memset(words, '\0', sizeof words); - for (i = 0; i < IN6ADDRSZ; i++) + for (i = 0; i < NS_IN6ADDRSZ; i++) words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); best.base = -1; cur.base = -1; - for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { + for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { if (words[i] == 0) { if (cur.base == -1) cur.base = i, cur.len = 1; @@ -152,7 +152,7 @@ inet_ntop6(src, dst, size) * Format the result. */ tp = tmp; - for (i = 0; i < (IN6ADDRSZ / 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 && i < (best.base + best.len)) { @@ -174,7 +174,8 @@ inet_ntop6(src, dst, size) tp += SPRINTF((tp, "%x", words[i])); } /* Was it a trailing run of 0x00's? */ - if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) + if (best.base != -1 && (best.base + best.len) == + (NS_IN6ADDRSZ / NS_INT16SZ)) *tp++ = ':'; *tp++ = '\0'; |
