integrate changes from bind 4.9 (most of them); continue to use address

[unix-history] / usr / src / lib / libc / net / gethostnamadr.c

diff --git a/usr/src/lib/libc/net/gethostnamadr.c b/usr/src/lib/libc/net/gethostnamadr.c
index a945985..9d938ee 100644 (file)
--- a/usr/src/lib/libc/net/gethostnamadr.c
+++ b/usr/src/lib/libc/net/gethostnamadr.c
@@ -1,29 +1,46 @@
-/*
+/*-

  * Copyright (c) 1985, 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1985, 1988 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * %sccs.include.redist.c%
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)gethostnamadr.c    6.32 (Berkeley) %G%";
+static char sccsid[] = "@(#)gethostnamadr.c    6.49 (Berkeley) %G%";
+static char rcsid[] = "$Id: gethnamaddr.c,v 4.9.1.1 1993/05/02 22:43:03 vixie Rel $";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

-#include <ctype.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <errno.h>

 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>

+#include <netdb.h>

 #include <resolv.h>
 #include <resolv.h>

+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>

 
 #define        MAXALIASES      35
 #define        MAXADDRS        35
 
 #define        MAXALIASES      35
 #define        MAXADDRS        35


@@ -34,12 +51,11 @@ static struct hostent host;
 static char *host_aliases[MAXALIASES];
 static char hostbuf[BUFSIZ+1];
 static struct in_addr host_addr;
 static char *host_aliases[MAXALIASES];
 static char hostbuf[BUFSIZ+1];
 static struct in_addr host_addr;

-static char HOSTDB[] = "/etc/hosts";

 static FILE *hostf = NULL;
 static char hostaddr[MAXADDRS];
 static char *host_addrs[2];
 static int stayopen = 0;
 static FILE *hostf = NULL;
 static char hostaddr[MAXADDRS];
 static char *host_addrs[2];
 static int stayopen = 0;

-static char *any();
+char *strpbrk();

 
 #if PACKETSZ > 1024
 #define        MAXPACKET       PACKETSZ
 
 #if PACKETSZ > 1024
 #define        MAXPACKET       PACKETSZ


@@ -52,14 +68,12 @@ typedef union {
     u_char buf[MAXPACKET];
 } querybuf;
 
     u_char buf[MAXPACKET];
 } querybuf;
 

-static union {
-    long al;
+typedef union {
+    int32_t al;

     char ac;
 } align;
 
     char ac;
 } align;
 

-
-int h_errno;
-extern errno;
+extern int h_errno;

 
 static struct hostent *
 getanswer(answer, anslen, iquery)
 
 static struct hostent *
 getanswer(answer, anslen, iquery)


@@ -88,8 +102,9 @@ getanswer(answer, anslen, iquery)
        cp = answer->buf + sizeof(HEADER);
        if (qdcount) {
                if (iquery) {
        cp = answer->buf + sizeof(HEADER);
        if (qdcount) {
                if (iquery) {

-                       if ((n = dn_expand((char *)answer->buf, eom,
-                            cp, bp, buflen)) < 0) {
+                       if ((n = dn_expand((u_char *)answer->buf,
+                           (u_char *)eom, (u_char *)cp, (u_char *)bp,
+                           buflen)) < 0) {

                                h_errno = NO_RECOVERY;
                                return ((struct hostent *) NULL);
                        }
                                h_errno = NO_RECOVERY;
                                return ((struct hostent *) NULL);
                        }


@@ -99,9 +114,9 @@ getanswer(answer, anslen, iquery)
                        bp += n;
                        buflen -= n;
                } else
                        bp += n;
                        buflen -= n;
                } else

-                       cp += dn_skipname(cp, eom) + QFIXEDSZ;
+                       cp += __dn_skipname(cp, eom) + QFIXEDSZ;

                while (--qdcount > 0)
                while (--qdcount > 0)

-                       cp += dn_skipname(cp, eom) + QFIXEDSZ;
+                       cp += __dn_skipname(cp, eom) + QFIXEDSZ;

        } else if (iquery) {
                if (hp->aa)
                        h_errno = HOST_NOT_FOUND;
        } else if (iquery) {
                if (hp->aa)
                        h_errno = HOST_NOT_FOUND;


@@ -110,22 +125,25 @@ getanswer(answer, anslen, iquery)
                return ((struct hostent *) NULL);
        }
        ap = host_aliases;
                return ((struct hostent *) NULL);
        }
        ap = host_aliases;

+       *ap = NULL;

        host.h_aliases = host_aliases;
        hap = h_addr_ptrs;
        host.h_aliases = host_aliases;
        hap = h_addr_ptrs;

+       *hap = NULL;

 #if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */
        host.h_addr_list = h_addr_ptrs;
 #endif
        haveanswer = 0;
        while (--ancount >= 0 && cp < eom) {
 #if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */
        host.h_addr_list = h_addr_ptrs;
 #endif
        haveanswer = 0;
        while (--ancount >= 0 && cp < eom) {

-               if ((n = dn_expand((char *)answer->buf, eom, cp, bp, buflen)) < 0)
+               if ((n = dn_expand((u_char *)answer->buf, (u_char *)eom,
+                   (u_char *)cp, (u_char *)bp, buflen)) < 0)

                        break;
                cp += n;
                type = _getshort(cp);
                        break;
                cp += n;
                type = _getshort(cp);

-               cp += sizeof(u_short);
+               cp += sizeof(u_int16_t);

                class = _getshort(cp);
                class = _getshort(cp);

-               cp += sizeof(u_short) + sizeof(u_long);
+               cp += sizeof(u_int16_t) + sizeof(u_int32_t);

                n = _getshort(cp);
                n = _getshort(cp);

-               cp += sizeof(u_short);
+               cp += sizeof(u_int16_t);

                if (type == T_CNAME) {
                        cp += n;
                        if (ap >= &host_aliases[MAXALIASES-1])
                if (type == T_CNAME) {
                        cp += n;
                        if (ap >= &host_aliases[MAXALIASES-1])


@@ -137,11 +155,10 @@ getanswer(answer, anslen, iquery)
                        continue;
                }
                if (iquery && type == T_PTR) {
                        continue;
                }
                if (iquery && type == T_PTR) {

-                       if ((n = dn_expand((char *)answer->buf, eom,
-                           cp, bp, buflen)) < 0) {
-                               cp += n;
-                               continue;
-                       }
+                       if ((n = dn_expand((u_char *)answer->buf,
+                           (u_char *)eom, (u_char *)cp, (u_char *)bp,
+                           buflen)) < 0)
+                               break;

                        cp += n;
                        host.h_name = bp;
                        return(&host);
                        cp += n;
                        host.h_name = bp;
                        return(&host);


@@ -174,7 +191,7 @@ getanswer(answer, anslen, iquery)
                        }
                }
 
                        }
                }
 

-               bp += sizeof(align) - ((u_long)bp % sizeof(align));
+               bp += sizeof(align) - ((u_int32_t)bp % sizeof(align));

 
                if (bp + n >= &hostbuf[sizeof(hostbuf)]) {
 #ifdef DEBUG
 
                if (bp + n >= &hostbuf[sizeof(hostbuf)]) {
 #ifdef DEBUG


@@ -204,12 +221,11 @@ getanswer(answer, anslen, iquery)
 
 struct hostent *
 gethostbyname(name)
 
 struct hostent *
 gethostbyname(name)

-       char *name;
+       const char *name;

 {
        querybuf buf;
 {
        querybuf buf;

-       register char *cp;
+       register const char *cp;

        int n;
        int n;

-       struct hostent *hp, *gethostdomain();

        extern struct hostent *_gethtbyname();
 
        /*
        extern struct hostent *_gethtbyname();
 
        /*


@@ -221,8 +237,28 @@ gethostbyname(name)
                        if (!*cp) {
                                if (*--cp == '.')
                                        break;
                        if (!*cp) {
                                if (*--cp == '.')
                                        break;

-                               h_errno = HOST_NOT_FOUND;
-                               return ((struct hostent *) NULL);
+                               /*
+                                * All-numeric, no dot at the end.
+                                * Fake up a hostent as if we'd actually
+                                * done a lookup.
+                                */
+                               if (!inet_aton(name, &host_addr)) {
+                                       h_errno = HOST_NOT_FOUND;
+                                       return((struct hostent *) NULL);
+                               }
+                               host.h_name = (char *)name;
+                               host.h_aliases = host_aliases;
+                               host_aliases[0] = NULL;
+                               host.h_addrtype = AF_INET;
+                               host.h_length = sizeof(u_int32_t);
+                               h_addr_ptrs[0] = (char *)&host_addr;
+                               h_addr_ptrs[1] = (char *)0;
+#if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */
+                               host.h_addr_list = h_addr_ptrs;
+#else
+                               host.h_addr = h_addr_ptrs[0];
+#endif
+                               return (&host);

                        }
                        if (!isdigit(*cp) && *cp != '.') 
                                break;
                        }
                        if (!isdigit(*cp) && *cp != '.') 
                                break;


@@ -243,7 +279,7 @@ gethostbyname(name)
 
 struct hostent *
 gethostbyaddr(addr, len, type)
 
 struct hostent *
 gethostbyaddr(addr, len, type)

-       char *addr;
+       const char *addr;

        int len, type;
 {
        int n;
        int len, type;
 {
        int n;


@@ -254,7 +290,7 @@ gethostbyaddr(addr, len, type)
        
        if (type != AF_INET)
                return ((struct hostent *) NULL);
        
        if (type != AF_INET)
                return ((struct hostent *) NULL);

-       (void)sprintf(qbuf, "%d.%d.%d.%d.in-addr.arpa",
+       (void)sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",

                ((unsigned)addr[3] & 0xff),
                ((unsigned)addr[2] & 0xff),
                ((unsigned)addr[1] & 0xff),
                ((unsigned)addr[3] & 0xff),
                ((unsigned)addr[2] & 0xff),
                ((unsigned)addr[1] & 0xff),


@@ -277,19 +313,24 @@ gethostbyaddr(addr, len, type)
        h_addr_ptrs[0] = (char *)&host_addr;
        h_addr_ptrs[1] = (char *)0;
        host_addr = *(struct in_addr *)addr;
        h_addr_ptrs[0] = (char *)&host_addr;
        h_addr_ptrs[1] = (char *)0;
        host_addr = *(struct in_addr *)addr;

+#if BSD < 43 && !defined(h_addr)       /* new-style hostent structure */
+       hp->h_addr = h_addr_ptrs[0];
+#endif

        return(hp);
 }
 
        return(hp);
 }
 

+void

 _sethtent(f)
        int f;
 {
        if (hostf == NULL)
 _sethtent(f)
        int f;
 {
        if (hostf == NULL)

-               hostf = fopen(HOSTDB, "r" );
+               hostf = fopen(_PATH_HOSTS, "r" );

        else
                rewind(hostf);
        stayopen |= f;
 }
 
        else
                rewind(hostf);
        stayopen |= f;
 }
 

+void

 _endhtent()
 {
        if (hostf && !stayopen) {
 _endhtent()
 {
        if (hostf && !stayopen) {


@@ -304,18 +345,18 @@ _gethtent()
        char *p;
        register char *cp, **q;
 
        char *p;
        register char *cp, **q;
 

-       if (hostf == NULL && (hostf = fopen(HOSTDB, "r" )) == NULL)
+       if (hostf == NULL && (hostf = fopen(_PATH_HOSTS, "r" )) == NULL)

                return (NULL);
 again:
        if ((p = fgets(hostbuf, BUFSIZ, hostf)) == NULL)
                return (NULL);
        if (*p == '#')
                goto again;
                return (NULL);
 again:
        if ((p = fgets(hostbuf, BUFSIZ, hostf)) == NULL)
                return (NULL);
        if (*p == '#')
                goto again;

-       cp = any(p, "#\n");
+       cp = strpbrk(p, "#\n");

        if (cp == NULL)
                goto again;
        *cp = '\0';
        if (cp == NULL)
                goto again;
        *cp = '\0';

-       cp = any(p, " \t");
+       cp = strpbrk(p, " \t");

        if (cp == NULL)
                goto again;
        *cp++ = '\0';
        if (cp == NULL)
                goto again;
        *cp++ = '\0';


@@ -324,14 +365,14 @@ again:
        host.h_addr_list = host_addrs;
 #endif
        host.h_addr = hostaddr;
        host.h_addr_list = host_addrs;
 #endif
        host.h_addr = hostaddr;

-       *((u_long *)host.h_addr) = inet_addr(p);
-       host.h_length = sizeof (u_long);
+       *((u_int32_t *)host.h_addr) = inet_addr(p);
+       host.h_length = sizeof (u_int32_t);

        host.h_addrtype = AF_INET;
        while (*cp == ' ' || *cp == '\t')
                cp++;
        host.h_name = cp;
        q = host.h_aliases = host_aliases;
        host.h_addrtype = AF_INET;
        while (*cp == ' ' || *cp == '\t')
                cp++;
        host.h_name = cp;
        q = host.h_aliases = host_aliases;

-       cp = any(cp, " \t");
+       cp = strpbrk(cp, " \t");

        if (cp != NULL) 
                *cp++ = '\0';
        while (cp && *cp) {
        if (cp != NULL) 
                *cp++ = '\0';
        while (cp && *cp) {


@@ -341,7 +382,7 @@ again:
                }
                if (q < &host_aliases[MAXALIASES - 1])
                        *q++ = cp;
                }
                if (q < &host_aliases[MAXALIASES - 1])
                        *q++ = cp;

-               cp = any(cp, " \t");
+               cp = strpbrk(cp, " \t");

                if (cp != NULL)
                        *cp++ = '\0';
        }
                if (cp != NULL)
                        *cp++ = '\0';
        }


@@ -349,22 +390,6 @@ again:
        return (&host);
 }
 
        return (&host);
 }
 

-static char *
-any(cp, match)
-       register char *cp;
-       char *match;
-{
-       register char *mp, c;
-
-       while (c = *cp) {
-               for (mp = match; *mp; mp++)
-                       if (*mp == c)
-                               return (cp);
-               cp++;
-       }
-       return ((char *)0);
-}
-

 struct hostent *
 _gethtbyname(name)
        char *name;
 struct hostent *
 _gethtbyname(name)
        char *name;


@@ -387,7 +412,7 @@ found:
 
 struct hostent *
 _gethtbyaddr(addr, len, type)
 
 struct hostent *
 _gethtbyaddr(addr, len, type)

-       char *addr;
+       const char *addr;

        int len, type;
 {
        register struct hostent *p;
        int len, type;
 {
        register struct hostent *p;