oops

[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 1da7f47..a945985 100644 (file)
--- a/usr/src/lib/libc/net/gethostnamadr.c
+++ b/usr/src/lib/libc/net/gethostnamadr.c
@@ -1,26 +1,32 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * 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.

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

-static char sccsid[] = "@(#)gethostnamadr.c    6.7 (Berkeley) %G%";
-#endif LIBC_SCCS and not lint
+static char sccsid[] = "@(#)gethostnamadr.c    6.32 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */

 
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

-#include <sys/types.h>

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

+#include <arpa/inet.h>

 #include <arpa/nameser.h>
 #include <resolv.h>
 
 #define        MAXALIASES      35
 #include <arpa/nameser.h>
 #include <resolv.h>
 
 #define        MAXALIASES      35

-#define MAXADDRS       35
+#define        MAXADDRS        35

 
 static char *h_addr_ptrs[MAXADDRS + 1];
 
 
 static char *h_addr_ptrs[MAXADDRS + 1];
 


@@ -30,15 +36,20 @@ static char hostbuf[BUFSIZ+1];
 static struct in_addr host_addr;
 static char HOSTDB[] = "/etc/hosts";
 static FILE *hostf = NULL;
 static struct in_addr host_addr;
 static char HOSTDB[] = "/etc/hosts";
 static FILE *hostf = NULL;

-static char line[BUFSIZ+1];

 static char hostaddr[MAXADDRS];
 static char *host_addrs[2];
 static int stayopen = 0;
 static char *any();
 
 static char hostaddr[MAXADDRS];
 static char *host_addrs[2];
 static int stayopen = 0;
 static char *any();
 

+#if PACKETSZ > 1024
+#define        MAXPACKET       PACKETSZ
+#else
+#define        MAXPACKET       1024
+#endif
+

 typedef union {
 typedef union {

-    HEADER qb1;
-    char qb2[PACKETSZ];
+    HEADER hdr;
+    u_char buf[MAXPACKET];

 } querybuf;
 
 static union {
 } querybuf;
 
 static union {


@@ -51,73 +62,36 @@ int h_errno;
 extern errno;
 
 static struct hostent *
 extern errno;
 
 static struct hostent *

-getanswer(msg, msglen, iquery)
-       char *msg;
-       int msglen, iquery;
+getanswer(answer, anslen, iquery)
+       querybuf *answer;
+       int anslen;
+       int iquery;

 {
        register HEADER *hp;
 {
        register HEADER *hp;

-       register char *cp;
+       register u_char *cp;

        register int n;
        register int n;

-       querybuf answer;
-       char *eom, *bp, **ap;
-       int type, class, ancount, qdcount, buflen;
-       int haveanswer, getclass;
+       u_char *eom;
+       char *bp, **ap;
+       int type, class, buflen, ancount, qdcount;
+       int haveanswer, getclass = C_ANY;

        char **hap;
 
        char **hap;
 

-       n = res_send(msg, msglen, (char *)&answer, sizeof(answer));
-       if (n < 0) {
-#ifdef DEBUG
-               int terrno;
-               terrno = errno;
-               if (_res.options & RES_DEBUG)
-                       printf("res_send failed\n");
-               errno = terrno;
-#endif
-               h_errno = TRY_AGAIN;
-               return (NULL);
-       }
-       eom = (char *)&answer + n;
+       eom = answer->buf + anslen;

        /*
         * find first satisfactory answer
         */
        /*
         * find first satisfactory answer
         */

-       hp = (HEADER *) &answer;
+       hp = &answer->hdr;

        ancount = ntohs(hp->ancount);
        qdcount = ntohs(hp->qdcount);
        ancount = ntohs(hp->ancount);
        qdcount = ntohs(hp->qdcount);

-       if (hp->rcode != NOERROR || ancount == 0) {
-#ifdef DEBUG
-               if (_res.options & RES_DEBUG)
-                       printf("rcode = %d, ancount=%d\n", hp->rcode, ancount);
-#endif
-               switch (hp->rcode) {
-                       case NXDOMAIN:
-                               /* Check if it's an authoritive answer */
-                               if (hp->aa)
-                                       h_errno = HOST_NOT_FOUND;
-                               else
-                                       h_errno = TRY_AGAIN;
-                               break;
-                       case SERVFAIL:
-                               h_errno = TRY_AGAIN;
-                               break;
-                       case NOERROR:
-                               h_errno = NO_ADDRESS;
-                               break;
-                       case FORMERR:
-                       case NOTIMP:
-                       case REFUSED:
-                               h_errno = NO_RECOVERY;
-               }
-               return (NULL);
-       }

        bp = hostbuf;
        buflen = sizeof(hostbuf);
        bp = hostbuf;
        buflen = sizeof(hostbuf);

-       cp = (char *)&answer + sizeof(HEADER);
+       cp = answer->buf + sizeof(HEADER);

        if (qdcount) {
                if (iquery) {
        if (qdcount) {
                if (iquery) {

-                       if ((n = dn_expand((char *)&answer, eom,
+                       if ((n = dn_expand((char *)answer->buf, eom,

                             cp, bp, buflen)) < 0) {
                                h_errno = NO_RECOVERY;
                             cp, bp, buflen)) < 0) {
                                h_errno = NO_RECOVERY;

-                               return (NULL);
+                               return ((struct hostent *) NULL);

                        }
                        cp += n + QFIXEDSZ;
                        host.h_name = bp;
                        }
                        cp += n + QFIXEDSZ;
                        host.h_name = bp;


@@ -125,30 +99,32 @@ getanswer(msg, msglen, iquery)
                        bp += n;
                        buflen -= n;
                } else
                        bp += n;
                        buflen -= n;
                } else

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

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

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

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

-               return (NULL);
+               return ((struct hostent *) NULL);

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

+#if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */

        host.h_addr_list = h_addr_ptrs;
        host.h_addr_list = h_addr_ptrs;

+#endif

        haveanswer = 0;
        while (--ancount >= 0 && cp < eom) {
        haveanswer = 0;
        while (--ancount >= 0 && cp < eom) {

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

                        break;
                cp += n;
                        break;
                cp += n;

-               type = getshort(cp);
+               type = _getshort(cp);

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

-               class = getshort(cp);
+               class = _getshort(cp);

                cp += sizeof(u_short) + sizeof(u_long);
                cp += sizeof(u_short) + sizeof(u_long);

-               n = getshort(cp);
+               n = _getshort(cp);

                cp += sizeof(u_short);
                if (type == T_CNAME) {
                        cp += n;
                cp += sizeof(u_short);
                if (type == T_CNAME) {
                        cp += n;


@@ -160,9 +136,9 @@ getanswer(msg, msglen, iquery)
                        buflen -= n;
                        continue;
                }
                        buflen -= n;
                        continue;
                }

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

                                cp += n;
                                continue;
                        }
                                cp += n;
                                continue;
                        }


@@ -170,7 +146,7 @@ getanswer(msg, msglen, iquery)
                        host.h_name = bp;
                        return(&host);
                }
                        host.h_name = bp;
                        return(&host);
                }

-               if (type != T_A)  {
+               if (iquery || type != T_A)  {

 #ifdef DEBUG
                        if (_res.options & RES_DEBUG)
                                printf("unexpected answer type %d, size %d\n",
 #ifdef DEBUG
                        if (_res.options & RES_DEBUG)
                                printf("unexpected answer type %d, size %d\n",


@@ -198,7 +174,7 @@ getanswer(msg, msglen, iquery)
                        }
                }
 
                        }
                }
 

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

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


@@ -214,11 +190,15 @@ getanswer(msg, msglen, iquery)
        }
        if (haveanswer) {
                *ap = NULL;
        }
        if (haveanswer) {
                *ap = NULL;

+#if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */

                *hap = NULL;
                *hap = NULL;

+#else
+               host.h_addr = h_addr_ptrs[0];
+#endif

                return (&host);
        } else {
                h_errno = TRY_AGAIN;
                return (&host);
        } else {
                h_errno = TRY_AGAIN;

-               return (NULL);
+               return ((struct hostent *) NULL);

        }
 }
 
        }
 }
 


@@ -226,24 +206,39 @@ struct hostent *
 gethostbyname(name)
        char *name;
 {
 gethostbyname(name)
        char *name;
 {

-       int n;

        querybuf buf;
        querybuf buf;

-       register struct hostent *hp;
+       register char *cp;
+       int n;
+       struct hostent *hp, *gethostdomain();

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

-       n = res_mkquery(QUERY, name, C_ANY, T_A, (char *)NULL, 0, NULL,
-               (char *)&buf, sizeof(buf));
-       if (n < 0) {
+       /*
+        * disallow names consisting only of digits/dots, unless
+        * they end in a dot.
+        */
+       if (isdigit(name[0]))
+               for (cp = name;; ++cp) {
+                       if (!*cp) {
+                               if (*--cp == '.')
+                                       break;
+                               h_errno = HOST_NOT_FOUND;
+                               return ((struct hostent *) NULL);
+                       }
+                       if (!isdigit(*cp) && *cp != '.') 
+                               break;
+               }
+
+       if ((n = res_search(name, C_IN, T_A, buf.buf, sizeof(buf))) < 0) {

 #ifdef DEBUG
                if (_res.options & RES_DEBUG)
 #ifdef DEBUG
                if (_res.options & RES_DEBUG)

-                       printf("res_mkquery failed\n");
+                       printf("res_search failed\n");

 #endif
 #endif

-               return (NULL);
+               if (errno == ECONNREFUSED)
+                       return (_gethtbyname(name));
+               else
+                       return ((struct hostent *) NULL);

        }
        }

-       hp = getanswer((char *)&buf, n, 0);
-       if (hp == NULL && errno == ECONNREFUSED)
-               hp = _gethtbyname(name);
-       return(hp);
+       return (getanswer(&buf, n, 0));

 }
 
 struct hostent *
 }
 
 struct hostent *


@@ -258,26 +253,25 @@ gethostbyaddr(addr, len, type)
        extern struct hostent *_gethtbyaddr();
        
        if (type != AF_INET)
        extern struct hostent *_gethtbyaddr();
        
        if (type != AF_INET)

-               return (NULL);
+               return ((struct hostent *) NULL);

        (void)sprintf(qbuf, "%d.%d.%d.%d.in-addr.arpa",
                ((unsigned)addr[3] & 0xff),
                ((unsigned)addr[2] & 0xff),
                ((unsigned)addr[1] & 0xff),
                ((unsigned)addr[0] & 0xff));
        (void)sprintf(qbuf, "%d.%d.%d.%d.in-addr.arpa",
                ((unsigned)addr[3] & 0xff),
                ((unsigned)addr[2] & 0xff),
                ((unsigned)addr[1] & 0xff),
                ((unsigned)addr[0] & 0xff));

-       n = res_mkquery(QUERY, qbuf, C_IN, T_PTR, NULL, 0, NULL,
-               (char *)&buf, sizeof(buf));
+       n = res_query(qbuf, C_IN, T_PTR, (char *)&buf, sizeof(buf));

        if (n < 0) {
 #ifdef DEBUG
                if (_res.options & RES_DEBUG)
        if (n < 0) {
 #ifdef DEBUG
                if (_res.options & RES_DEBUG)

-                       printf("res_mkquery failed\n");
+                       printf("res_query failed\n");

 #endif
 #endif

-               return (NULL);
+               if (errno == ECONNREFUSED)
+                       return (_gethtbyaddr(addr, len, type));
+               return ((struct hostent *) NULL);

        }
        }

-       hp = getanswer((char *)&buf, n, 1);
-       if (hp == NULL && errno == ECONNREFUSED)
-               hp = _gethtbyaddr(addr, len, type);
+       hp = getanswer(&buf, n, 1);

        if (hp == NULL)
        if (hp == NULL)

-               return(NULL);
+               return ((struct hostent *) NULL);

        hp->h_addrtype = type;
        hp->h_length = len;
        h_addr_ptrs[0] = (char *)&host_addr;
        hp->h_addrtype = type;
        hp->h_length = len;
        h_addr_ptrs[0] = (char *)&host_addr;


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

-

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


@@ -300,7 +293,7 @@ _sethtent(f)
 _endhtent()
 {
        if (hostf && !stayopen) {
 _endhtent()
 {
        if (hostf && !stayopen) {

-               fclose(hostf);
+               (void) fclose(hostf);

                hostf = NULL;
        }
 }
                hostf = NULL;
        }
 }


@@ -314,7 +307,7 @@ _gethtent()
        if (hostf == NULL && (hostf = fopen(HOSTDB, "r" )) == NULL)
                return (NULL);
 again:
        if (hostf == NULL && (hostf = fopen(HOSTDB, "r" )) == NULL)
                return (NULL);
 again:

-       if ((p = fgets(line, BUFSIZ, hostf)) == NULL)
+       if ((p = fgets(hostbuf, BUFSIZ, hostf)) == NULL)

                return (NULL);
        if (*p == '#')
                goto again;
                return (NULL);
        if (*p == '#')
                goto again;


@@ -327,7 +320,9 @@ again:
                goto again;
        *cp++ = '\0';
        /* THIS STUFF IS INTERNET SPECIFIC */
                goto again;
        *cp++ = '\0';
        /* THIS STUFF IS INTERNET SPECIFIC */

+#if BSD >= 43 || defined(h_addr)       /* new-style hostent structure */

        host.h_addr_list = host_addrs;
        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);
        host.h_addr = hostaddr;
        *((u_long *)host.h_addr) = inet_addr(p);
        host.h_length = sizeof (u_long);


@@ -376,13 +371,13 @@ _gethtbyname(name)
 {
        register struct hostent *p;
        register char **cp;
 {
        register struct hostent *p;
        register char **cp;

-
+       

        _sethtent(0);
        while (p = _gethtent()) {
        _sethtent(0);
        while (p = _gethtent()) {

-               if (strcmp(p->h_name, name) == 0)
+               if (strcasecmp(p->h_name, name) == 0)

                        break;
                for (cp = p->h_aliases; *cp != 0; cp++)
                        break;
                for (cp = p->h_aliases; *cp != 0; cp++)

-                       if (strcmp(*cp, name) == 0)
+                       if (strcasecmp(*cp, name) == 0)

                                goto found;
        }
 found:
                                goto found;
        }
 found:


@@ -399,7 +394,7 @@ _gethtbyaddr(addr, len, type)
 
        _sethtent(0);
        while (p = _gethtent())
 
        _sethtent(0);
        while (p = _gethtent())

-               if (p->h_addrtype == type && bcmp(p->h_addr, addr, len))
+               if (p->h_addrtype == type && !bcmp(p->h_addr, addr, len))

                        break;
        _endhtent();
        return (p);
                        break;
        _endhtent();
        return (p);