-/*
- * Copyright (c) 1985, 1988 Regents of the University of California.
- * All rights reserved.
+/*-
+ * Copyright (c) 1985, 1988, 1993
+ * The Regents of the University of California. All rights reserved.
*
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement: ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * 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)
-static char sccsid[] = "@(#)gethostnamadr.c 6.41 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
+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>
-#include <ctype.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <errno.h>
#include <arpa/inet.h>
#include <arpa/nameser.h>
+#include <netdb.h>
#include <resolv.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
#define MAXALIASES 35
#define MAXADDRS 35
} querybuf;
typedef union {
- long al;
+ int32_t al;
char ac;
} align;
-
-int h_errno;
-extern errno;
+extern int h_errno;
static struct hostent *
getanswer(answer, anslen, 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);
}
bp += n;
buflen -= n;
} else
- cp += dn_skipname(cp, eom) + QFIXEDSZ;
+ cp += __dn_skipname(cp, eom) + QFIXEDSZ;
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;
#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);
- cp += sizeof(u_short);
+ cp += sizeof(u_int16_t);
class = _getshort(cp);
- cp += sizeof(u_short) + sizeof(u_long);
+ cp += sizeof(u_int16_t) + sizeof(u_int32_t);
n = _getshort(cp);
- cp += sizeof(u_short);
+ cp += sizeof(u_int16_t);
if (type == T_CNAME) {
cp += n;
if (ap >= &host_aliases[MAXALIASES-1])
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);
}
}
- 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
struct hostent *
gethostbyname(name)
- char *name;
+ const char *name;
{
querybuf buf;
- register char *cp;
+ register const char *cp;
int n;
extern struct hostent *_gethtbyname();
/*
* 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);
}
- 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_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 */
struct hostent *
gethostbyaddr(addr, len, type)
- char *addr;
+ const char *addr;
int len, type;
{
int n;
return(hp);
}
+void
_sethtent(f)
int f;
{
stayopen |= f;
}
+void
_endhtent()
{
if (hostf && !stayopen) {
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++;
struct hostent *
_gethtbyaddr(addr, len, type)
- char *addr;
+ const char *addr;
int len, type;
{
register struct hostent *p;