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 b044261..9d938ee 100644 (file)
--- a/usr/src/lib/libc/net/gethostnamadr.c
+++ b/usr/src/lib/libc/net/gethostnamadr.c
@@ -1,24 +1,46 @@
-/*
+/*-

  * Copyright (c) 1985, 1988 Regents of the University of California.
  * All rights reserved.
  *
  * %sccs.include.redist.c%
  * Copyright (c) 1985, 1988 Regents of the University of California.
  * All rights reserved.
  *
  * %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.42 (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


@@ -47,13 +69,11 @@ typedef union {
 } querybuf;
 
 typedef union {
 } querybuf;
 
 typedef union {

-    long al;
+    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)


@@ -82,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);
                        }


@@ -113,15 +134,16 @@ getanswer(answer, anslen, iquery)
 #endif
        haveanswer = 0;
        while (--ancount >= 0 && cp < eom) {
 #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])


@@ -133,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);


@@ -170,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


@@ -200,10 +221,10 @@ 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;
        extern struct hostent *_gethtbyname();
 
        int n;
        extern struct hostent *_gethtbyname();
 


@@ -219,19 +240,17 @@ gethostbyname(name)
                                /*
                                 * All-numeric, no dot at the end.
                                 * Fake up a hostent as if we'd actually
                                /*
                                 * All-numeric, no dot at the end.
                                 * Fake up a hostent as if we'd actually

-                                * done a lookup.  What if someone types
-                                * 255.255.255.255?  The test below will
-                                * succeed spuriously... ???
+                                * done a lookup.

                                 */
                                 */

-                               if ((host_addr.s_addr = inet_addr(name)) == -1) {
+                               if (!inet_aton(name, &host_addr)) {

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

-                               host.h_name = name;
+                               host.h_name = (char *)name;

                                host.h_aliases = host_aliases;
                                host_aliases[0] = NULL;
                                host.h_addrtype = AF_INET;
                                host.h_aliases = host_aliases;
                                host_aliases[0] = NULL;
                                host.h_addrtype = AF_INET;

-                               host.h_length = sizeof(u_long);
+                               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 */
                                h_addr_ptrs[0] = (char *)&host_addr;
                                h_addr_ptrs[1] = (char *)0;
 #if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */


@@ -260,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;


@@ -300,6 +319,7 @@ gethostbyaddr(addr, len, type)
        return(hp);
 }
 
        return(hp);
 }
 

+void

 _sethtent(f)
        int f;
 {
 _sethtent(f)
        int f;
 {


@@ -310,6 +330,7 @@ _sethtent(f)
        stayopen |= f;
 }
 
        stayopen |= f;
 }
 

+void

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


@@ -344,8 +365,8 @@ 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_addrtype = AF_INET;
        while (*cp == ' ' || *cp == '\t')
                cp++;


@@ -391,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;