 @@ -1,14 +1,14 @@
-/*	$NetBSD: getaddrinfo.c,v 1.115 2017/01/10 17:51:01 christos Exp $	*/
+/*	$NetBSD: getaddrinfo.c,v 1.115.6.1 2017/10/25 06:56:41 snj Exp $	*/
 /*	$KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * 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
 @@ -45,27 +45,27 @@
  * Note:
  * - The code filters out AFs that are not supported by the kernel,
  *   when globbing NULL hostname (to loopback, or wildcard).  Is it the right
  *   thing to do?  What is the relationship with post-RFC2553 AI_ADDRCONFIG
  *   in ai_flags?
  * - (post-2553) semantics of AI_ADDRCONFIG itself is too vague.
  *   (1) what should we do against numeric hostname (2) what should we do
  *   against NULL hostname (3) what is AI_ADDRCONFIG itself.  AF not ready?
  *   non-loopback address configured?  global address configured?
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.115 2017/01/10 17:51:01 christos Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.115.6.1 2017/10/25 06:56:41 snj Exp $");
 #endif /* LIBC_SCCS and not lint */
 #ifndef RUMP_ACTION
 #include "namespace.h"
 #endif
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
 @@ -2529,91 +2529,117 @@ _yp_getaddrinfo(void *rv, void *cb_data,
 /*
  * Formulate a normal query, send, and await answer.
  * Returned answer is placed in supplied buffer "answer".
  * Perform preliminary check of answer, returning success only
  * if no error is indicated and the answer count is nonzero.
  * Return the size of the response on success, -1 on error.
  * Error number is left in h_errno.
+ *
  * Caller must parse answer and determine whether it answers the question.
  */
 static int
 res_queryN(const char *name, /* domain name */ struct res_target *target,
-    res_state res)
+    res_state statp)
+{
 	u_char buf[MAXPACKET];
 	HEADER *hp;
 	int n;
 	struct res_target *t;
 	int rcode;
 	u_char *rdata;
 	int ancount;
 	_DIAGASSERT(name != NULL);
 	/* XXX: target may be NULL??? */
 	rcode = NOERROR;
 	ancount = 0;
 	for (t = target; t; t = t->next) {
 		int class, type;
 		u_char *answer;
 		int anslen;
 		u_int oflags;
 		hp = (HEADER *)(void *)t->answer;
 		oflags = statp->_flags;
 again:
 		hp->rcode = NOERROR;	/* default */
 		/* make it easier... */
 		class = t->qclass;
 		type = t->qtype;
 		answer = t->answer;
 		anslen = t->anslen;
 #ifdef DEBUG
-		if (res->options & RES_DEBUG)
+		if (statp->options & RES_DEBUG)
 			printf(";; res_nquery(%s, %d, %d)\n", name, class, type);
 #endif
-		n = res_nmkquery(res, QUERY, name, class, type, NULL, 0, NULL,
+		n = res_nmkquery(statp, QUERY, name, class, type, NULL, 0, NULL,
 		    buf, (int)sizeof(buf));
 #ifdef RES_USE_EDNS0
-		if (n > 0 && (res->options & RES_USE_EDNS0) != 0)
+		if (n > 0 && (statp->_flags & RES_F_EDNS0ERR) == 0 &&
-			n = res_nopt(res, n, buf, (int)sizeof(buf), anslen);
+		    (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0) {
 			n = res_nopt(statp, n, buf, (int)sizeof(buf), anslen);
 			rdata = &buf[n];
 			if (n > 0 && (statp->options & RES_NSID) != 0U) {
 				n = res_nopt_rdata(statp, n, buf,
 				    (int)sizeof(buf),
 				    rdata, NS_OPT_NSID, 0, NULL);
+			}
+		}
 #endif
 		if (n <= 0) {
 #ifdef DEBUG
-			if (res->options & RES_DEBUG)
+			if (statp->options & RES_DEBUG)
 				printf(";; res_nquery: mkquery failed\n");
 #endif
 			h_errno = NO_RECOVERY;
 			return n;
+		}
-		n = res_nsend(res, buf, n, answer, anslen);
+		n = res_nsend(statp, buf, n, answer, anslen);
 #if 0
 		if (n < 0) {
 #ifdef RES_USE_EDNS0
 			/* if the query choked with EDNS0, retry without EDNS0 */
 			if ((statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0U &&
 			    ((oflags ^ statp->_flags) & RES_F_EDNS0ERR) != 0) {
 				statp->_flags |= RES_F_EDNS0ERR;
 				if (statp->options & RES_DEBUG)
 					printf(";; res_nquery: retry without EDNS0\n");
 				goto again;
+			}
 #endif
 #if 0
 #ifdef DEBUG
-			if (res->options & RES_DEBUG)
+			if (statp->options & RES_DEBUG)
 				printf(";; res_query: send error\n");
 #endif
 			h_errno = TRY_AGAIN;
 			return n;
 #endif
+		}
 		if (n < 0 || hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
 			rcode = hp->rcode;	/* record most recent error */
 #ifdef DEBUG
-			if (res->options & RES_DEBUG)
+			if (statp->options & RES_DEBUG)
-				printf(";; rcode = %u, ancount=%u\n", hp->rcode,
+				printf(";; rcode = (%s), counts = an:%d ns:%d ar:%d\n",
-				    ntohs(hp->ancount));
+				       p_rcode(hp->rcode),
 				       ntohs(hp->ancount),
 				       ntohs(hp->nscount),
 				       ntohs(hp->arcount));
 #endif
 			continue;
+		}
 		ancount += ntohs(hp->ancount);
 		t->n = n;
+	}
 	if (ancount == 0) {
 		switch (rcode) {
 		case NXDOMAIN:
 			h_errno = HOST_NOT_FOUND;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: res_mkquery.c,v 1.15 2015/02/24 17:56:20 christos Exp $	*/
+/*	$NetBSD: res_mkquery.c,v 1.15.8.1 2017/10/25 06:56:41 snj Exp $	*/
 /*
  * Portions Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996, 1997, 1988, 1999, 2001, 2003  Internet Software Consortium.
+ *
  * Permission to use, copy, modify, and/or 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.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
  * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
  * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 @@ -62,27 +62,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #ifdef notdef
 static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka Exp";
 #else
-__RCSID("$NetBSD: res_mkquery.c,v 1.15 2015/02/24 17:56:20 christos Exp $");
+__RCSID("$NetBSD: res_mkquery.c,v 1.15.8.1 2017/10/25 06:56:41 snj Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include "port_before.h"
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <assert.h>
 #include <netdb.h>
 #include <resolv.h>
 @@ -132,26 +132,27 @@ res_nmkquery(res_state statp,
 		       _res_opcodes[op], dname, p_class(class), p_type(type));
 #endif
 	/*
 	 * Initialize header fields.
 	 */
 	if ((buf == NULL) || (buflen < HFIXEDSZ))
 		return (-1);
 	memset(buf, 0, HFIXEDSZ);
 	hp = (HEADER *)(void *)buf;
 	statp->id = res_nrandomid(statp);
 	hp->id = htons(statp->id);
 	hp->opcode = op;
 	hp->rd = (statp->options & RES_RECURSE) != 0U;
 	hp->ad = (statp->options & RES_USE_DNSSEC) != 0U;
 	hp->rcode = NOERROR;
 	cp = buf + HFIXEDSZ;
 	ep = buf + buflen;
 	dpp = dnptrs;
 	*dpp++ = buf;
 	*dpp++ = NULL;
 	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
 	/*
 	 * perform opcode specific processing
 	 */
 	switch (op) {
 	case QUERY:	/*FALLTHROUGH*/
 	case NS_NOTIFY_OP: