Libinfo-392.tar.gz

[apple/libinfo.git] / gen.subproj / inet_ntop.c

diff --git a/gen.subproj/inet_ntop.c b/gen.subproj/inet_ntop.c
index d4f08aebc2c3d9da4edd1d072a3995fd95f9a46a..51f70501ef7ff74fb9ba24d5cd2829e29df530d5 100644 (file)
--- a/gen.subproj/inet_ntop.c
+++ b/gen.subproj/inet_ntop.c
@@ -5,31 +5,43 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
+#include <errno.h>
 #include <sys/socket.h>
 
 void __res_close()
 {
 }
 
+#define MAX_V4_ADDR_LEN 16
 #define MAX_V6_ADDR_LEN 64
 
 static const char *hexchars = "0123456789abcdef";
 
 const char *
-inet_ntop6(const struct in6_addr *addr, char *dst, size_t size)
+inet_ntop6(const struct in6_addr *addr, char *dst, socklen_t size)
 {
        char hexa[8][5], tmp[MAX_V6_ADDR_LEN];
        int zr[8];
-       size_t len;
+       socklen_t len;
        int32_t i, j, k, skip;
        uint8_t x8, hx8;
        uint16_t x16;
        struct in_addr a4;
-       
-       if (addr == NULL) return NULL;
-       
+
+       if (addr == NULL)
+       {
+               errno = EAFNOSUPPORT;
+               return NULL;
+       }
+
+       if (dst == NULL)
+       {
+               errno = ENOSPC;
+               return NULL;
+       }
+
        memset(tmp, 0, MAX_V6_ADDR_LEN);
-       
+
        /*  check for mapped or compat addresses */
        i = IN6_IS_ADDR_V4MAPPED(addr);
        j = IN6_IS_ADDR_V4COMPAT(addr);
@@ -38,49 +50,54 @@ inet_ntop6(const struct in6_addr *addr, char *dst, size_t size)
                a4.s_addr = addr->__u6_addr.__u6_addr32[3];
                sprintf(tmp, "::%s%s", (i != 0) ? "ffff:" : "", inet_ntoa(a4));
                len = strlen(tmp) + 1;
-               if (len > size) return NULL;
+               if (len > size)
+               {
+                       errno = ENOSPC;
+                       return NULL;
+               }
+
                memcpy(dst, tmp, len);
                return dst;
        }
-       
+
        k = 0;
        for (i = 0; i < 16; i += 2)
        {
                j = 0;
                skip = 1;
-               
+
                memset(hexa[k], 0, 5);
-               
+
                x8 = addr->__u6_addr.__u6_addr8[i];
-               
+
                hx8 = x8 >> 4;
                if (hx8 != 0)
                {
                        skip = 0;
                        hexa[k][j++] = hexchars[hx8];
                }
-               
+
                hx8 = x8 & 0x0f;
                if ((skip == 0) || ((skip == 1) && (hx8 != 0)))
                {
                        skip = 0;
                        hexa[k][j++] = hexchars[hx8];
                }
-               
+
                x8 = addr->__u6_addr.__u6_addr8[i + 1];
-               
+
                hx8 = x8 >> 4;
                if ((skip == 0) || ((skip == 1) && (hx8 != 0)))
                {
                        hexa[k][j++] = hexchars[hx8];
                }
-               
+
                hx8 = x8 & 0x0f;
                hexa[k][j++] = hexchars[hx8];
-               
+
                k++;
        }
-       
+
        /* find runs of zeros for :: convention */
        j = 0;
        for (i = 7; i >= 0; i--)
@@ -91,7 +108,7 @@ inet_ntop6(const struct in6_addr *addr, char *dst, size_t size)
                else j = 0;
                zr[i] = j;
        }
-       
+
        /* find longest run of zeros */
        k = -1;
        j = 0;
@@ -103,12 +120,12 @@ inet_ntop6(const struct in6_addr *addr, char *dst, size_t size)
                        j = zr[i];
                }
        }
-       
+
        for(i = 0; i < 8; i++)
        {
                if (i != k) zr[i] = 0;
        }
-       
+
        len = 0;
        for (i = 0; i < 8; i++)
        {
@@ -127,41 +144,67 @@ inet_ntop6(const struct in6_addr *addr, char *dst, size_t size)
        /* trailing NULL */
        len++;
 
-       if (len > size) return NULL;
+       if (len > size)
+       {
+               errno = ENOSPC;
+               return NULL;
+       }
+
        memcpy(dst, tmp, len);
        return dst;
 }
 
 const char *
-inet_ntop4(const struct in_addr *addr, char *buf, size_t len)
+inet_ntop4(const struct in_addr *addr, char *dst, socklen_t size)
 {
+       char tmp[MAX_V4_ADDR_LEN], *p;
        const u_int8_t *ap = (u_int8_t *)&addr->s_addr;
-       int i;
-       char *bp=buf;
-       
+       int i, ql, len;
+
+       if (addr == NULL)
+       {
+               errno = EAFNOSUPPORT;
+               return NULL;
+       }
+
+       if (dst == NULL)
+       {
+               errno = ENOSPC;
+               return NULL;
+       }
+
+       memset(tmp, 0, MAX_V4_ADDR_LEN);
+
+       /* 3 dots, trailing nul */
+       len = 4;
+
+       p = tmp;
+
        for (i = 0; i < 4; i++, ap++)
        {
-               if (bp >= buf + len - 1)
-               {
-                       buf[len-1] = 0;
-                       return buf;
-               }
+               snprintf(p, 4, "%d", *ap);
+               ql = strlen(p);
+               len += ql;
+               p += ql;
+               if (i < 3) *p++ = '.';
+       }
 
-               sprintf(bp, "%d", *ap);
-               bp += strlen(bp);
-               if (i != 3) *bp++='.';
+       if (len > size)
+       {
+               errno = ENOSPC;
+               return NULL;
        }
 
-       *bp = 0;
-       return buf;
+       memcpy(dst, tmp, len);
+       return dst;
 }
 
 const char *
-inet_ntop(int af, const void *addr, char *buf, size_t len)
+inet_ntop(int af, const void *addr, char *buf, socklen_t len)
 {
-       if(af==AF_INET6)
-               return inet_ntop6(addr, buf, len);
-       if(af==AF_INET)
-               return inet_ntop4(addr, buf, len);
+       if (af == AF_INET6) return inet_ntop6(addr, buf, len);
+       if (af == AF_INET) return inet_ntop4(addr, buf, len);
+
+       errno = EAFNOSUPPORT;
        return NULL;
 }