diff -ur bind-8.2.3-orig/include/resolv.h bind-8.2.3/include/resolv.h --- bind-8.2.3-orig/include/resolv.h Sat Dec 23 09:14:49 2000 +++ bind-8.2.3/include/resolv.h Fri Apr 13 14:44:09 2001 @@ -176,8 +176,9 @@ struct { u_int16_t nscount; u_int16_t nstimes[MAXNS]; /* ms. */ + u_int16_t nscount6; int nssocks[MAXNS]; - struct sockaddr_in nsaddrs[MAXNS]; + struct sockaddr_in6 *nsaddrs[MAXNS]; } _ext; } _u; }; diff -ur bind-8.2.3-orig/lib/resolv/res_init.c bind-8.2.3/lib/resolv/res_init.c --- bind-8.2.3-orig/lib/resolv/res_init.c Wed Nov 8 07:47:37 2000 +++ bind-8.2.3/lib/resolv/res_init.c Fri Apr 13 18:07:16 2001 @@ -149,6 +149,7 @@ register int n; char buf[BUFSIZ]; int nserv = 0; /* number of nameserver records read from file */ + int nservall = 0; /* number of ns records read, nserv IPv4 only */ int haveenv = 0; int havesearch = 0; #ifdef RESOLVSORT @@ -179,6 +180,10 @@ statp->qhook = NULL; statp->rhook = NULL; statp->_u._ext.nscount = 0; + statp->_u._ext.nscount6 = 0; + + for (n = 0; n < MAXNS; n++) + statp->_u._ext.nsaddrs[n] = NULL; /* Allow user to override the local domain definition */ if ((cp = getenv("LOCALDOMAIN")) != NULL) { @@ -280,7 +285,7 @@ continue; } /* read nameservers to query */ - if (MATCH(buf, "nameserver") && nserv < MAXNS) { + if (MATCH(buf, "nameserver") && nservall < MAXNS) { struct in_addr a; cp = buf + sizeof("nameserver") - 1; @@ -292,6 +297,28 @@ statp->nsaddr_list[nserv].sin_port = htons(NAMESERVER_PORT); nserv++; + nservall++; + } else { + struct in6_addr a6; + char *el; + + if ((el = strchr(cp, '\n')) != NULL) + *el = '\0'; + if ((*cp != '\0') && + (inet_pton(AF_INET6, cp, &a6) > 0)) { + struct sockaddr_in6 *sa6; + + sa6 = malloc(sizeof(*sa6)); + if (sa6 != NULL) { + sa6->sin6_addr = a6; + sa6->sin6_family = AF_INET6; + sa6->sin6_port = htons(NAMESERVER_PORT); + statp->_u._ext.nsaddrs[nservall] = sa6; + statp->_u._ext.nstimes[nservall] = RES_MAXTIME; + statp->_u._ext.nssocks[nservall] = -1; + nservall++; + } + } } continue; } @@ -345,6 +372,8 @@ } if (nserv > 1) statp->nscount = nserv; + if (nservall - nserv > 0) + statp->_u._ext.nscount6 = nservall - nserv; #ifdef RESOLVSORT statp->nsort = nsort; #endif @@ -501,7 +530,8 @@ statp->_vcsock = -1; statp->_flags &= ~(RES_F_VC | RES_F_CONN); } - for (ns = 0; ns < statp->_u._ext.nscount; ns++) { + for (ns = 0; ns < statp->_u._ext.nscount + statp->_u._ext.nscount6; + ns++) { if (statp->_u._ext.nssocks[ns] != -1) { (void) close(statp->_u._ext.nssocks[ns]); statp->_u._ext.nssocks[ns] = -1; diff -ur bind-8.2.3-orig/lib/resolv/res_send.c bind-8.2.3/lib/resolv/res_send.c --- bind-8.2.3-orig/lib/resolv/res_send.c Sat Dec 23 09:14:58 2000 +++ bind-8.2.3/lib/resolv/res_send.c Fri Apr 13 18:17:45 2001 @@ -119,9 +119,10 @@ u_char *, int, int *, int, int *, int *); static void Aerror(const res_state, FILE *, const char *, int, - struct sockaddr_in); + struct sockaddr_in6); static void Perror(const res_state, FILE *, const char *, int); -static int sock_eq(struct sockaddr_in *, struct sockaddr_in *); +static int sock_eq(struct sockaddr_in6 *, struct sockaddr_in6 *); +static void convaddr4to6(struct sockaddr_in6 *sa); #ifdef NEED_PSELECT static int pselect(int, void *, void *, void *, struct timespec *, @@ -140,21 +141,37 @@ * paul vixie, 29may94 */ int -res_ourserver_p(const res_state statp, const struct sockaddr_in *inp) { - struct sockaddr_in ina; - int ns; - - ina = *inp; - for (ns = 0; ns < statp->nscount; ns++) { - const struct sockaddr_in *srv = &statp->nsaddr_list[ns]; - - if (srv->sin_family == ina.sin_family && - srv->sin_port == ina.sin_port && - (srv->sin_addr.s_addr == INADDR_ANY || - srv->sin_addr.s_addr == ina.sin_addr.s_addr)) - return (1); +res_ourserver_p(const res_state statp, const struct sockaddr_in6 *inp) { + int ns; + + if (inp->sin6_family == AF_INET) { + struct sockaddr_in *in4p = (struct sockaddr_in *) inp; + in_port_t port = in4p->sin_port; + in_addr_t addr = in4p->sin_addr.s_addr; + + for (ns = 0; ns < MAXNS; ns++) { + const struct sockaddr_in *srv = + (struct sockaddr_in *)EXT(statp).nsaddrs[ns]; + + if ((srv != NULL) && (srv->sin_family == AF_INET) && + (srv->sin_port == port) && + (srv->sin_addr.s_addr == INADDR_ANY || + srv->sin_addr.s_addr == addr)) + return (1); } - return (0); + } else if (inp->sin6_family == AF_INET6) { + for (ns = 0; ns < MAXNS; ns++) { + const struct sockaddr_in6 *srv = EXT(statp).nsaddrs[ns]; + if ((srv != NULL) && (srv->sin6_family == AF_INET6) && + (srv->sin6_port == inp->sin6_port) && + !(memcmp(&srv->sin6_addr, &in6addr_any, + sizeof (struct in6_addr)) && + memcmp(&srv->sin6_addr, &inp->sin6_addr, + sizeof (struct in6_addr)))) + return (1); + } + } + return (0); } /* int @@ -275,8 +292,10 @@ needclose++; else for (ns = 0; ns < statp->nscount; ns++) - if (!sock_eq(&statp->nsaddr_list[ns], - &EXT(statp).nsaddrs[ns])) { + if (!sock_eq((struct sockaddr_in6 *) + &statp->nsaddr_list[ns], + EXT(statp).nsaddrs[ns])) + { needclose++; break; } @@ -290,12 +309,42 @@ * Maybe initialize our private copy of the ns_addr_list. */ if (EXT(statp).nscount == 0) { + n = 0; for (ns = 0; ns < statp->nscount; ns++) { - EXT(statp).nsaddrs[ns] = statp->nsaddr_list[ns]; - EXT(statp).nstimes[ns] = RES_MAXTIME; - EXT(statp).nssocks[ns] = -1; + /* find a hole */ + while ((n < MAXNS) && + (EXT(statp).nsaddrs[n] != NULL) && + (EXT(statp).nsaddrs[n]->sin6_family == AF_INET6) && + !IN6_IS_ADDR_V4MAPPED( + &EXT(statp).nsaddrs[n]->sin6_addr)) + n++; + if (n == MAXNS) + break; + + if (EXT(statp).nsaddrs[n] == NULL) + EXT(statp).nsaddrs[n] = + malloc(sizeof (struct sockaddr_in6)); + if (EXT(statp).nsaddrs[n] != NULL) { + memcpy(EXT(statp).nsaddrs[n], + &statp->nsaddr_list[ns], + sizeof (struct sockaddr_in)); + EXT(statp).nstimes[n] = RES_MAXTIME; + EXT(statp).nssocks[n] = -1; + n++; + } } EXT(statp).nscount = statp->nscount; + /* If holes left, free memory and set to NULL */ + while (n < MAXNS) { + if ((EXT(statp).nsaddrs[n] != NULL) && + ((EXT(statp).nsaddrs[n]->sin6_family != AF_INET6) + || IN6_IS_ADDR_V4MAPPED( + &EXT(statp).nsaddrs[n]->sin6_addr))) { + free(EXT(statp).nsaddrs[n]); + EXT(statp).nsaddrs[n] = NULL; + } + n++; + } } /* @@ -304,17 +353,17 @@ */ if ((statp->options & RES_ROTATE) != 0 && (statp->options & RES_BLAST) == 0) { - struct sockaddr_in ina; - int lastns = statp->nscount - 1; + struct sockaddr_in6 *ina; + int lastns = statp->nscount + EXT(statp).nscount6 - 1; int fd; - ina = statp->nsaddr_list[0]; + ina = EXT(statp).nsaddrs[0]; fd = EXT(statp).nssocks[0]; for (ns = 0; ns < lastns; ns++) { - statp->nsaddr_list[ns] = statp->nsaddr_list[ns + 1]; + EXT(statp).nsaddrs[ns] = EXT(statp).nsaddrs[ns + 1]; EXT(statp).nssocks[ns] = EXT(statp).nssocks[ns + 1]; } - statp->nsaddr_list[lastns] = ina; + EXT(statp).nsaddrs[lastns] = ina; EXT(statp).nssocks[lastns] = fd; } @@ -322,8 +371,11 @@ * Send request, RETRY times, or until successful. */ for (try = 0; try < statp->retry; try++) { - for (ns = 0; ns < statp->nscount; ns++) { - struct sockaddr_in *nsap = &statp->nsaddr_list[ns]; + for (ns = 0; ns < MAXNS; ns++) { + struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns]; + + if (nsap == NULL) + goto next_ns; same_ns: if (statp->qhook) { int done = 0, loops = 0; @@ -331,7 +383,8 @@ do { res_sendhookact act; - act = (*statp->qhook)(&nsap, &buf, &buflen, + act = (*statp->qhook)((struct sockaddr_in **) + &nsap, &buf, &buflen, ans, anssiz, &resplen); switch (act) { case res_goahead: @@ -355,9 +408,20 @@ } while (!done); } - Dprint(statp->options & RES_DEBUG, - (stdout, ";; Querying server (# %d) address = %s\n", - ns + 1, inet_ntoa(nsap->sin_addr))); +#ifdef DEBUG + if (nsap->sin6_family == AF_INET6) { + char addr[INET6_ADDRSTRLEN]; + inet_ntop(AF_INET6, &nsap->sin6_addr, addr, sizeof addr); + Dprint(statp->options & RES_DEBUG, + (stdout, ";; Querying server (# %d) address = %s\n", + ns + 1, addr)); + } else { + Dprint(statp->options & RES_DEBUG, + (stdout, ";; Querying server (# %d) address = %s\n", + ns + 1, inet_ntoa(((struct sockaddr_in *) + nsap)->sin_addr))); + } +#endif if (v_circuit) { /* Use VC; at most one attempt per server. */ @@ -407,7 +471,8 @@ do { res_sendhookact act; - act = (*statp->rhook)(nsap, buf, buflen, + act = (*statp->rhook)((struct sockaddr_in *) + nsap, buf, buflen, ans, anssiz, &resplen); switch (act) { case res_goahead: @@ -457,7 +522,7 @@ { const HEADER *hp = (HEADER *) buf; HEADER *anhp = (HEADER *) ans; - struct sockaddr_in *nsap = &statp->nsaddr_list[ns]; + struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns]; int truncating, connreset, resplen, n; struct iovec iov[2]; u_short len; @@ -469,7 +534,7 @@ /* Are we still talking to whom we want to talk to? */ if (statp->_vcsock >= 0 && (statp->_flags & RES_F_VC) != 0) { - struct sockaddr_in peer; + struct sockaddr_in6 peer; int size = sizeof peer; if (getpeername(statp->_vcsock, @@ -484,7 +549,7 @@ if (statp->_vcsock >= 0) res_nclose(statp); - statp->_vcsock = socket(PF_INET, SOCK_STREAM, 0); + statp->_vcsock = socket(nsap->sin6_family, SOCK_STREAM, 0); if (statp->_vcsock > highestFD) { res_nclose(statp); errno = ENOTSOCK; @@ -496,7 +561,9 @@ } errno = 0; if (connect(statp->_vcsock, (struct sockaddr *)nsap, - sizeof *nsap) < 0) { + nsap->sin6_family != PF_INET6 + ? sizeof(struct sockaddr) + : sizeof(*nsap)) < 0) { *terrno = errno; Aerror(statp, stderr, "connect/vc", errno, *nsap); res_nclose(statp); @@ -625,14 +692,24 @@ { const HEADER *hp = (HEADER *) buf; HEADER *anhp = (HEADER *) ans; - const struct sockaddr_in *nsap = &statp->nsaddr_list[ns]; + struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns]; struct timespec now, timeout, finish; fd_set dsmask; - struct sockaddr_in from; + struct sockaddr_in6 from; + static int socket_pf = 0; int fromlen, resplen, seconds, n, s; if (EXT(statp).nssocks[ns] == -1) { - EXT(statp).nssocks[ns] = socket(PF_INET, SOCK_DGRAM, 0); + /* only try IPv6 if IPv6 NS and if not failed before */ + if ((EXT(statp).nscount6 > 0) && (socket_pf != PF_INET)) { + EXT(statp).nssocks[ns] = + socket(PF_INET6, SOCK_DGRAM, 0); + socket_pf = EXT(statp).nssocks[ns] < 0 ? PF_INET + : PF_INET6; + } + if (EXT(statp).nssocks[ns] < 0) + EXT(statp).nssocks[ns] = socket(PF_INET, SOCK_DGRAM, 0); + if (EXT(statp).nssocks[ns] > highestFD) { res_nclose(statp); errno = ENOTSOCK; @@ -643,6 +720,9 @@ return (-1); } #ifndef CANNOT_CONNECT_DGRAM + /* If IPv6 socket and nsap is IPv4, make it IPv4-mapped */ + if ((socket_pf == PF_INET6) && (nsap->sin6_family == AF_INET)) + convaddr4to6(nsap); /* * On a 4.3BSD+ machine (client and server, * actually), sending to a nameserver datagram @@ -655,7 +735,8 @@ * the absence of a nameserver without timing out. */ if (connect(EXT(statp).nssocks[ns], (struct sockaddr *)nsap, - sizeof *nsap) < 0) { + socket_pf != PF_INET6 ? sizeof(struct sockaddr) + : sizeof(*nsap)) < 0) { Aerror(statp, stderr, "connect(dg)", errno, *nsap); res_nclose(statp); return (0); @@ -672,9 +753,13 @@ return (0); } #else /* !CANNOT_CONNECT_DGRAM */ + /* If IPv6 socket and nsap is IPv4, make it IPv4-mapped */ + if ((socket_pf == PF_INET6) && (nsap->sin6_family == AF_INET)) + convaddr4to6(nsap); if (sendto(s, (char*)buf, buflen, 0, - (struct sockaddr *)nsap, sizeof *nsap) != buflen) - { + (struct sockaddr *)nsap, + socket_pf != PF_INET6 ? sizeof(struct sockaddr) + : sizeof(*nsap)) != buflen) { Aerror(statp, stderr, "sendto", errno, *nsap); res_nclose(statp); return (0); @@ -716,7 +801,7 @@ return (0); } errno = 0; - fromlen = sizeof(struct sockaddr_in); + fromlen = sizeof(struct sockaddr_in6); resplen = recvfrom(s, (char*)ans, anssiz,0, (struct sockaddr *)&from, &fromlen); if (resplen <= 0) { @@ -806,19 +891,29 @@ static void Aerror(const res_state statp, FILE *file, const char *string, int error, - struct sockaddr_in address) + struct sockaddr_in6 address) { int save = errno; if ((statp->options & RES_DEBUG) != 0) { - char tmp[sizeof "255.255.255.255"]; + char tmp[INET6_ADDRSTRLEN]; - fprintf(file, "res_send: %s ([%s].%u): %s\n", - string, - inet_ntop(address.sin_family, &address.sin_addr, - tmp, sizeof tmp), - ntohs(address.sin_port), + if (address.sin6_family == AF_INET6) { + fprintf(file, "res_send: %s ([%s].%u): %s\n", + string, + inet_ntop(AF_INET6, &address.sin6_addr, + tmp, sizeof tmp), + ntohs(address.sin6_port), strerror(error)); + } else { + struct sockaddr_in *addr = (struct sockaddr_in *)&address; + fprintf(file, "res_send: %s ([%s].%u): %s\n", + string, + inet_ntop(addr->sin_family, &addr->sin_addr, + tmp, sizeof tmp), + ntohs(addr->sin_port), + strerror(error)); + } } errno = save; } @@ -834,10 +929,43 @@ } static int -sock_eq(struct sockaddr_in *a1, struct sockaddr_in *a2) { - return ((a1->sin_family == a2->sin_family) && - (a1->sin_port == a2->sin_port) && - (a1->sin_addr.s_addr == a2->sin_addr.s_addr)); +sock_eq(struct sockaddr_in6 *a1, struct sockaddr_in6 *a2) { + if (a1->sin6_family == a2->sin6_family) { + if (a1->sin6_family == AF_INET) + return ((((struct sockaddr_in *)a1)->sin_port == + ((struct sockaddr_in *)a2)->sin_port) && + (((struct sockaddr_in *)a1)->sin_addr.s_addr == + ((struct sockaddr_in *)a2)->sin_addr.s_addr)); + else + return ((a1->sin6_port == a2->sin6_port) && + !memcmp(&a1->sin6_addr, &a2->sin6_addr, + sizeof (struct in6_addr))); + } + if (a1->sin6_family == AF_INET) { + struct sockaddr_in6 *sap = a1; + a1 = a2; + a2 = sap; + } /* assumes that AF_INET and AF_INET6 are the only possibilities */ + return ((a1->sin6_port == ((struct sockaddr_in *)a2)->sin_port) && + IN6_IS_ADDR_V4MAPPED(&a1->sin6_addr) && + ((in_addr_t)a1->sin6_addr.s6_addr[12]) == + ((struct sockaddr_in *)a2)->sin_addr.s_addr); +} + +/* + * Converts IPv4 family, address and port to + * IPv6 family, IPv4-mapped IPv6 address and port. + */ +static void +convaddr4to6(struct sockaddr_in6 *sa) +{ + struct sockaddr_in *sa4p = (struct sockaddr_in *) sa; + + sa->sin6_family = AF_INET6; + sa->sin6_port = sa4p->sin_port; + memset(&sa->sin6_addr.s6_addr[0], 0, 10); + memset(&sa->sin6_addr.s6_addr[10], 0xff, 2); + memcpy(&sa->sin6_addr.s6_addr[12], &sa4p->sin_addr.s_addr, 4); } #ifdef NEED_PSELECT