oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Compress zeros when converting IPv6 addresses

Browse Source 
libroken implementation of inet_ntop() was not compressing strings of
zeros.  While it is optional, not doing so was intefering with address
conversion tests in lib/krb5.
This commit is contained in:
Asanka Herath
2010-08-23 23:57:19 -04:00
committed by Asanka C. Herath
parent 8a1fb91009
commit 738e2ea55b
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/roken/inet_ntop.c
View File

@@ -83,6 +83,7 @@ inet_ntop_v6 (const void *src, char *dst, size_t size)
const struct in6_addr *addr = (struct in6_addr *)src; const struct in6_addr *addr = (struct in6_addr *)src;
const u_char *ptr = addr->s6_addr; const u_char *ptr = addr->s6_addr;
const char *orig_dst = dst; const char *orig_dst = dst;
int compressed = 0;
if (size < INET6_ADDRSTRLEN) { if (size < INET6_ADDRSTRLEN) {
errno = ENOSPC; errno = ENOSPC;
@@ -91,6 +92,26 @@ inet_ntop_v6 (const void *src, char *dst, size_t size)
for (i = 0; i < 8; ++i) { for (i = 0; i < 8; ++i) {
int non_zerop = 0; int non_zerop = 0;
if (compressed == 0 &&
ptr[0] == 0 && ptr[1] == 0 &&
i <= 5 &&
ptr[2] == 0 && ptr[3] == 0 &&
ptr[4] == 0 && ptr[5] == 0) {
compressed = 1;
if (i == 0)
*dst++ = ':';
*dst++ = ':';
for (ptr += 6, i += 3;
i < 8 && ptr[0] == 0 && ptr[1] == 0;
++i, ptr += 2);
if (i >= 8)
break;
}
if (non_zerop || (ptr[0] >> 4)) { if (non_zerop || (ptr[0] >> 4)) {
*dst++ = xdigits[ptr[0] >> 4]; *dst++ = xdigits[ptr[0] >> 4];
non_zerop = 1; non_zerop = 1;