Update.
[kopensolaris-gnu/glibc.git] / inet / getnameinfo.c
index 030447a..f31d3b9 100644 (file)
@@ -42,19 +42,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* This software is Copyright 1996 by Craig Metz, All Rights Reserved.  */
 
-#define INET6 1
-#define LOCAL 1
-#define HOSTTABLE 0
-#define RESOLVER 1
-
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>
-#if LOCAL
 #include <sys/un.h>
 #include <sys/utsname.h>
-#endif /* LOCAL */
 #include <netdb.h>
 #include <errno.h>
 #include <string.h>
@@ -64,264 +57,299 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <bits/libc-lock.h>
 #include <arpa/inet.h>
 
-#ifndef AF_LOCAL
-#define AF_LOCAL AF_UNIX
-#endif /* AF_LOCAL */
-
-#if HOSTTABLE
-struct hostent *_addr2hostname_hosts(const char *, int, int);
-#endif /* HOSTTABLE */
-
 #ifndef min
-#define min(x,y) (((x) > (y)) ? (y) : (x))
+# define min(x,y) (((x) > (y)) ? (y) : (x))
 #endif /* min */
 
-static const char *domain;
 
-static char *nrl_domainname(void)
+static char *
+internal_function
+nrl_domainname (void)
 {
+  static char *domain = NULL;
   static int first = 1;
 
-  if (first) {
-
-    __libc_lock_define_initialized (static, lock);
-    __libc_lock_lock (lock);
-
-    if (first) {
-      char *c;
-      struct hostent *h, th;
-      int tmpbuflen = 1024;
-      char *tmpbuf = __alloca(tmpbuflen);
-      int herror;
-
-      first = 0;
-
-      while (__gethostbyname_r("localhost", &th, tmpbuf, tmpbuflen, &h,
-                              &herror)) {
-       if (herror == NETDB_INTERNAL) {
-         if (errno == ERANGE) {
-           tmpbuflen *= 2;
-           tmpbuf = __alloca(tmpbuflen);
-         }
-       } else {
-         break;
-       }
-      }
-
-      if (h && (c = strchr(h->h_name, '.'))) {
-       domain = __strdup (++c);
-       goto ret;
-      }
-
-      while (gethostname (tmpbuf, tmpbuflen)) {
-       tmpbuflen *= 2;
-       tmpbuf = __alloca (tmpbuflen);
-      }
-      if (c = strchr(tmpbuf, '.')) {
-       domain = __strdup(++c);
-       goto ret;
-      }
-
-      while (__gethostbyname_r(tmpbuf, &th, tmpbuf, tmpbuflen, &h,
-                              &herror)) {
-       if (herror == NETDB_INTERNAL) {
-         if (errno == ERANGE) {
-           tmpbuflen *= 2;
-           tmpbuf = __alloca(tmpbuflen);
-         }
-       } else {
-         break;
-       }
-      }
-
-      if (h && (c = strchr(h->h_name, '.'))) {
-       domain = __strdup(++c);
-       goto ret;
-      }
-
-      {
-       struct in_addr in_addr;
+  if (first)
+    {
+      __libc_lock_define_initialized (static, lock);
+      __libc_lock_lock (lock);
+
+      if (first)
+       {
+         char *c;
+         struct hostent *h, th;
+         size_t tmpbuflen = 1024;
+         char *tmpbuf = alloca (tmpbuflen);
+         int herror;
+
+         first = 0;
+
+         while (__gethostbyname_r ("localhost", &th, tmpbuf, tmpbuflen, &h,
+                                   &herror))
+           {
+             if (herror == NETDB_INTERNAL && errno == ERANGE)
+               {
+                 tmpbuflen *= 2;
+                 tmpbuf = alloca (tmpbuflen);
+               }
+             else
+               break;
+           }
 
-       in_addr.s_addr = htonl(0x7f000001);
+         if (h && (c = strchr (h->h_name, '.')))
+           domain = __strdup (++c);
+         else
+           {
+             /* The name contains no domain information.  Use the name
+                now to get more information.  */
+             while (__gethostname (tmpbuf, tmpbuflen))
+               {
+                 tmpbuflen *= 2;
+                 tmpbuf = alloca (tmpbuflen);
+               }
 
-       while (__gethostbyaddr_r((const char *)&in_addr,
-                                sizeof(struct in_addr), AF_INET, &th, tmpbuf,
-                                tmpbuflen, &h, &herror)) {
-         if (herror == NETDB_INTERNAL) {
-           if (errno == ERANGE) {
-             tmpbuflen *= 2;
-             tmpbuf = __alloca(tmpbuflen);
+             if ((c = strchr (tmpbuf, '.')))
+               domain = __strdup (++c);
+             else
+               {
+                 /* We need to preserve the hostname.  */
+                 const char *hstname = strdupa (tmpbuf);
+
+                 while (__gethostbyname_r (hstname, &th, tmpbuf, tmpbuflen,
+                                           &h, &herror))
+                   {
+                     if (herror == NETDB_INTERNAL && errno == ERANGE)
+                       {
+                         tmpbuflen *= 2;
+                         tmpbuf = alloca (tmpbuflen);
+                       }
+                     else
+                       break;
+                   }
+
+                 if (h && (c = strchr(h->h_name, '.')))
+                   domain = __strdup (++c);
+                 else
+                   {
+                     struct in_addr in_addr;
+
+                     in_addr.s_addr = htonl (0x7f000001);
+
+                     while (__gethostbyaddr_r ((const char *) &in_addr,
+                                               sizeof (struct in_addr),
+                                               AF_INET, &th, tmpbuf,
+                                               tmpbuflen, &h, &herror))
+                       {
+                         if (herror == NETDB_INTERNAL && errno == ERANGE)
+                           {
+                             tmpbuflen *= 2;
+                             tmpbuf = alloca (tmpbuflen);
+                           }
+                         else
+                           break;
+                       }
+
+                     if (h && (c = strchr (h->h_name, '.')))
+                       domain = __strdup (++c);
+                   }
+               }
            }
-         } else {
-           break;
-         }
-       }
-
-       if (h && (c = strchr(h->h_name, '.'))) {
-         domain = __strdup(++c);
-         goto ret;
        }
-      }
 
+      __libc_lock_unlock (lock);
     }
 
-  ret:
-    __libc_lock_unlock (lock);
-  }
-
   return domain;
 };
 
-int getnameinfo(const struct sockaddr *sa, size_t addrlen, char *host, size_t hostlen, char *serv, size_t servlen, int flags)
+
+int
+getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
+            size_t hostlen, char *serv, size_t servlen, int flags)
 {
   int serrno = errno;
   int tmpbuflen = 1024;
   int herrno;
-  char *tmpbuf = __alloca(tmpbuflen);
+  char *tmpbuf = alloca (tmpbuflen);
   struct hostent th;
 
-  if (!sa)
+  if (sa == NULL)
     return -1;
 
-  if (host && (hostlen > 0))
-    switch(sa->sa_family) {
+  if (host != NULL && hostlen > 0)
+    switch(sa->sa_family)
+      {
       case AF_INET:
-#if INET6
       case AF_INET6:
-#endif /* INET6 */
-       if (!(flags & NI_NUMERICHOST)) {
-         struct hostent *h = NULL;
-#if HOSTTABLE
-#if INET6
-         if (sa->sa_family == AF_INET6)
-           h = _addr2hostname_hosts((void *)&(((struct sockaddr_in6 *)sa)->sin6_addr), sizeof(struct in6_addr), AF_INET6);
-         else
-#endif /* INET6 */
-           h = _addr2hostname_hosts((void *)&(((struct sockaddr_in *)sa)->sin_addr), sizeof(struct in_addr), AF_INET);
-#endif /* HOSTTABLE */
-
-#if RESOLVER
-         if (!h) {
-#if INET6
-           if (sa->sa_family == AF_INET6) {
-             while (__gethostbyaddr_r((void *)&(((struct sockaddr_in6 *)sa)->sin6_addr), sizeof(struct in6_addr), AF_INET6, &th, tmpbuf, tmpbuflen, &h, &herrno)) {
-               if (herrno == NETDB_INTERNAL) {
-                 if (errno == ERANGE) {
-                   tmpbuflen *= 2;
-                   tmpbuf = __alloca(tmpbuflen);
-                 } else {
-                   __set_h_errno(herrno);
-                   goto fail;
+       if (!(flags & NI_NUMERICHOST))
+         {
+           struct hostent *h = NULL;
+           if (h == NULL)
+             {
+               if (sa->sa_family == AF_INET6)
+                 {
+                   while (__gethostbyaddr_r ((void *) &(((struct sockaddr_in6 *) sa)->sin6_addr),
+                                             sizeof(struct in6_addr),
+                                             AF_INET6, &th, tmpbuf, tmpbuflen,
+                                             &h, &herrno))
+                     {
+                       if (herrno == NETDB_INTERNAL)
+                         {
+                           if (errno == ERANGE)
+                             {
+                               tmpbuflen *= 2;
+                               tmpbuf = alloca (tmpbuflen);
+                             }
+                           else
+                             {
+                               __set_h_errno (herrno);
+                               __set_errno (serrno);
+                               return -1;
+                             }
+                         }
+                       else
+                         {
+                           break;
+                         }
+                     }
+                 }
+               else
+                 {
+                   while (__gethostbyaddr_r ((void *) &(((struct sockaddr_in *)sa)->sin_addr),
+                                             sizeof(struct in_addr), AF_INET,
+                                             &th, tmpbuf, tmpbuflen,
+                                             &h, &herrno))
+                     {
+                       if (errno == ERANGE)
+                         {
+                           tmpbuflen *= 2;
+                           tmpbuf = alloca (tmpbuflen);
+                         }
+                       else
+                         {
+                           break;
+                         }
+                     }
                  }
-               } else {
-                 break;
-               }
-             }
-           } else {
-#endif /* INET6 */
-             while (__gethostbyaddr_r((void *)&(((struct sockaddr_in *)sa)->sin_addr), sizeof(struct in_addr), AF_INET, &th, tmpbuf, tmpbuflen, &h, &herrno)) {
-               if (errno == ERANGE) {
-                 tmpbuflen *= 2;
-                 tmpbuf = __alloca(tmpbuflen);
-               } else {
-                 break;
-               }
              }
-           }
-         }
-#endif /* RESOLVER */
 
-         if (h) {
-           if (flags & NI_NOFQDN) {
-             char *c;
-             if ((c = nrl_domainname()) && (c = strstr(h->h_name, c)) && (c != h->h_name) && (*(--c) == '.')) {
-               strncpy(host, h->h_name, min(hostlen, (size_t) (c - h->h_name)));
+           if (h)
+             {
+               if (flags & NI_NOFQDN)
+                 {
+                   char *c;
+                   if ((c = nrl_domainname ()) && (c = strstr(h->h_name, c))
+                       && (c != h->h_name) && (*(--c) == '.'))
+                     {
+                       strncpy (host, h->h_name,
+                                min(hostlen, (size_t) (c - h->h_name)));
+                       break;
+                     }
+                 }
+               strncpy (host, h->h_name, hostlen);
                break;
-             };
-           };
-           strncpy(host, h->h_name, hostlen);
-           break;
-         };
-       };
+             }
+         }
 
        if (flags & NI_NAMEREQD)
-         goto fail;
-
-        {
-         const char *c;
-#if INET6
-         if (sa->sa_family == AF_INET6)
-           c = inet_ntop(AF_INET6, (void *)&(((struct sockaddr_in6 *)sa)->sin6_addr), host, hostlen);
-         else
-#endif /* INET6 */
-           c = inet_ntop(AF_INET, (void *)&(((struct sockaddr_in *)sa)->sin_addr), host, hostlen);
-
-         if (!c)
-           goto fail;
-       };
+         {
+           __set_errno (serrno);
+           return -1;
+         }
+       else
+         {
+           const char *c;
+           if (sa->sa_family == AF_INET6)
+             c = inet_ntop (AF_INET6,
+                            (void *) &(((struct sockaddr_in6 *) sa)->sin6_addr),
+                            host, hostlen);
+           else
+             c = inet_ntop (AF_INET,
+                            (void *) &(((struct sockaddr_in *) sa)->sin_addr),
+                            host, hostlen);
+
+           if (c == NULL)
+             {
+               __set_errno (serrno);
+               return -1;
+             }
+         }
        break;
-#if LOCAL
+
       case AF_LOCAL:
-       if (!(flags & NI_NUMERICHOST)) {
-         struct utsname utsname;
+       if (!(flags & NI_NUMERICHOST))
+         {
+           struct utsname utsname;
 
-         if (!uname(&utsname)) {
-           strncpy(host, utsname.nodename, hostlen);
-           break;
+           if (!uname (&utsname))
+             {
+               strncpy (host, utsname.nodename, hostlen);
+               break;
+             };
          };
-       };
 
        if (flags & NI_NAMEREQD)
-         goto fail;
+          {
+           __set_errno (serrno);
+           return -1;
+         }
 
-       strncpy(host, "localhost", hostlen);
+       strncpy (host, "localhost", hostlen);
        break;
-#endif /* LOCAL */
+
       default:
         return -1;
-    };
+    }
 
   if (serv && (servlen > 0))
-    switch(sa->sa_family) {
+    switch(sa->sa_family)
+      {
       case AF_INET:
-#if INET6
       case AF_INET6:
-#endif /* INET6 */
-       if (!(flags & NI_NUMERICSERV)) {
-         struct servent *s, ts;
-         while (__getservbyport_r(((struct sockaddr_in *)sa)->sin_port, ((flags & NI_DGRAM) ? "udp" : "tcp"), &ts, tmpbuf, tmpbuflen, &s)) {
-           if (herrno == NETDB_INTERNAL) {
-             if (errno == ERANGE) {
-               tmpbuflen *= 2;
-               tmpbuf = __alloca(tmpbuflen);
-             } else {
-               goto fail;
+       if (!(flags & NI_NUMERICSERV))
+         {
+           struct servent *s, ts;
+           while (__getservbyport_r (((struct sockaddr_in *) sa)->sin_port,
+                                     ((flags & NI_DGRAM) ? "udp" : "tcp"),
+                                     &ts, tmpbuf, tmpbuflen, &s))
+             {
+               if (herrno == NETDB_INTERNAL)
+                 {
+                   if (errno == ERANGE)
+                     {
+                       tmpbuflen *= 2;
+                       tmpbuf = __alloca (tmpbuflen);
+                     }
+                   else
+                     {
+                       __set_errno (serrno);
+                       return -1;
+                     }
+                 }
+               else
+                 {
+                   break;
+                 }
+             }
+           if (s)
+             {
+               strncpy (serv, s->s_name, servlen);
+               break;
              }
-           } else {
-             break;
-           }
          }
-         if (s) {
-           strncpy(serv, s->s_name, servlen);
-           break;
-         };
-       };
-       snprintf(serv, servlen, "%d", ntohs(((struct sockaddr_in *)sa)->sin_port));
+       __snprintf (serv, servlen, "%d",
+                   ntohs (((struct sockaddr_in *) sa)->sin_port));
        break;
-#if LOCAL
+
       case AF_LOCAL:
-       strncpy(serv, ((struct sockaddr_un *)sa)->sun_path, servlen);
+       strncpy (serv, ((struct sockaddr_un *) sa)->sun_path, servlen);
        break;
-#endif /* LOCAL */
-    };
+    }
+
   if (host && (hostlen > 0))
     host[hostlen-1] = 0;
   if (serv && (servlen > 0))
     serv[servlen-1] = 0;
   errno = serrno;
   return 0;
-
-fail:
-  errno = serrno;
-  return -1;
-};
+}