diff options
Diffstat (limited to 'libexec/tcpd/tcpdchk/scaffold.c')
| -rw-r--r-- | libexec/tcpd/tcpdchk/scaffold.c | 63 |
1 files changed, 56 insertions, 7 deletions
diff --git a/libexec/tcpd/tcpdchk/scaffold.c b/libexec/tcpd/tcpdchk/scaffold.c index 1d51f3eb6df..8ce6f7257e7 100644 --- a/libexec/tcpd/tcpdchk/scaffold.c +++ b/libexec/tcpd/tcpdchk/scaffold.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scaffold.c,v 1.3 1999/06/06 18:58:54 deraadt Exp $ */ +/* $OpenBSD: scaffold.c,v 1.4 2000/10/14 00:56:14 itojun Exp $ */ /* * Routines for testing only. Not really industrial strength. @@ -10,7 +10,7 @@ #if 0 static char sccs_id[] = "@(#) scaffold.c 1.5 95/01/03 09:13:48"; #else -static char rcsid[] = "$OpenBSD: scaffold.c,v 1.3 1999/06/06 18:58:54 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: scaffold.c,v 1.4 2000/10/14 00:56:14 itojun Exp $"; #endif #endif @@ -68,6 +68,7 @@ struct hostent *hp; exit(1); } memset((char *) &hb->host, 0, sizeof(hb->host)); + hb->host.h_addrtype = hp->h_addrtype; hb->host.h_length = hp->h_length; hb->host.h_addr_list = hb->addr_list; hb->host.h_addr_list[count] = 0; @@ -89,6 +90,9 @@ char *host; struct hostent *hp; static struct hostent h; static char *addr_list[2]; +#ifdef INET6 + static struct in6_addr in6; +#endif /* * Host address: translate it to internal form. @@ -97,8 +101,18 @@ char *host; h.h_addr_list = addr_list; h.h_addr_list[0] = (char *) &addr; h.h_length = sizeof(addr); + h.h_addrtype = AF_INET; return (dup_hostent(&h)); } +#ifdef INET6 + if (inet_pton(AF_INET6, host, &in6) == 1) { + h.h_addr_list = addr_list; + h.h_addr_list[0] = (char *) &in6; + h.h_length = sizeof(in6); + h.h_addrtype = AF_INET6; + return (dup_hostent(&h)); + } +#endif /* * Map host name to a series of addresses. Watch out for non-internet @@ -106,10 +120,28 @@ char *host; * been "enhanced" to accept numeric addresses. Make a copy of the * address list so that later gethostbyXXX() calls will not clobber it. */ - if (NOT_INADDR(host) == 0) { +#ifdef INET6 + if (NOT_INADDR(host) == 0 && inet_pton(AF_INET6, host, &in6) == 1) +#else + if (NOT_INADDR(host) == 0) +#endif + { tcpd_warn("%s: not an internet address", host); return (0); } +#ifdef INET6 + /* + * XXX this behavior may, or may not be desirable. + * - we may better use getipnodebyname() to addresses of get both AFs, + * however, getipnodebyname() is not widely implemented. + * - it may be better to have a way to specify the AF to use. + */ + if ((hp = gethostbyname2(host, AF_INET)) == 0 + && (hp = gethostbyname2(host, AF_INET6)) == 0) { + tcpd_warn("%s: host not found", host); + return (0); + } +#else if ((hp = gethostbyname(host)) == 0) { tcpd_warn("%s: host not found", host); return (0); @@ -118,6 +150,7 @@ char *host; tcpd_warn("%d: not an internet host", hp->h_addrtype); return (0); } +#endif if (STR_NE(host, hp->h_name)) { tcpd_warn("%s: hostname alias", host); tcpd_warn("(official name: %s)", hp->h_name); @@ -131,20 +164,36 @@ int check_dns(host) char *host; { struct request_info request; - struct sockaddr_in sin; + struct sockaddr_storage sin; struct hostent *hp; int count; char *addr; + char *ap; + int alen; if ((hp = find_inet_addr(host)) == 0) return (0); request_init(&request, RQ_CLIENT_SIN, &sin, 0); sock_methods(&request); memset((char *) &sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; + sin.ss_family = hp->h_addrtype; + switch (hp->h_addrtype) { + case AF_INET: + ap = (char *)&((struct sockaddr_in *)&sin)->sin_addr; + alen = sizeof(struct in6_addr); + break; +#ifdef INET6 + case AF_INET6: + ap = (char *)&((struct sockaddr_in6 *)&sin)->sin6_addr; + alen = sizeof(struct in6_addr); + break; +#endif + default: + return (0); + } for (count = 0; (addr = hp->h_addr_list[count]) != 0; count++) { - memcpy((char *) &sin.sin_addr, addr, sizeof(sin.sin_addr)); + memcpy(ap, addr, alen); /* * Force host name and address conversions. Use the request structure @@ -186,7 +235,7 @@ struct request_info *request; /* ARGSUSED */ void rfc931(a1, a2, d1) -struct sockaddr_in *a1, *a2; +struct sockaddr *a1, *a2; char *d1; { } |