From: Grigorii Demidov <grigorii.demidov@nic.cz>
Date: Thu, 29 Nov 2018 16:58:25 +0000 (+0100)
Subject: daemon: forwarding - attempt to handle timeouted upstream
X-Git-Tag: v3.2.0~15^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0814906752d20a61175d354c7fd8f6f17f7f4a02;p=thirdparty%2Fknot-resolver.git

daemon: forwarding - attempt to handle timeouted upstream
---

diff --git a/daemon/worker.c b/daemon/worker.c
index 1b5b5b3d5..5c153811e 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1331,9 +1331,9 @@ static int tcp_task_step(struct qr_task *task,
 	}
 
 	if (ret != kr_ok()) {
-		subreq_finalize(task, packet_source, packet);
+		subreq_finalize(task, addr, packet);
 		if (ret == kr_error(EAGAIN)) {
-			ret = qr_task_step(task, NULL, NULL);
+			ret = qr_task_step(task, addr, NULL);
 		} else {
 			ret = qr_task_finalize(task, KR_STATE_FAIL);
 		}
diff --git a/lib/nsrep.c b/lib/nsrep.c
index 69d963474..57747dd32 100644
--- a/lib/nsrep.c
+++ b/lib/nsrep.c
@@ -485,11 +485,6 @@ int kr_nsrep_sort(struct kr_nsrep *ns, kr_nsrep_rtt_lru_t *rtt_cache)
 		return kr_error(EINVAL);
 	}
 
-	if (ns->addr[1].ip.sa_family == AF_UNSPEC) {
-		/* We have only one entry here, do nothing */
-		return kr_ok();
-	}
-
 	/* Compute the scores.  Unfortunately there's no space for scores
 	 * along the addresses. */
 	unsigned scores[KR_NSREP_MAXADDR];
diff --git a/lib/resolve.c b/lib/resolve.c
index 800f8f4ae..6361d705c 100644
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -882,9 +882,7 @@ static void update_nslist_score(struct kr_request *request, struct kr_query *qry
 	} else if (!(qry->flags.DNSSEC_BOGUS)) {
 		kr_nsrep_update_rtt(&qry->ns, src, KR_NS_TIMEOUT, ctx->cache_rtt, KR_NS_UPDATE);
 		WITH_VERBOSE(qry) {
-			char addr_str[INET6_ADDRSTRLEN];
-			inet_ntop(src->sa_family, kr_inaddr(src), addr_str, sizeof(addr_str));
-			VERBOSE_MSG(qry, "=> server: '%s' flagged as 'bad'\n", addr_str);
+			VERBOSE_MSG(qry, "=> server: '%s' flagged as 'bad'\n", kr_straddr(src));
 		}
 	}
 }
@@ -1429,6 +1427,20 @@ ns_election:
 		kr_nsrep_elect_addr(qry, request->ctx);
 	} else if (qflg.FORWARD || qflg.STUB) {
 		kr_nsrep_sort(&qry->ns, request->ctx->cache_rtt);
+		if (qry->ns.score > KR_NS_TIMEOUT) {
+			if (kr_zonecut_is_empty(&qry->zone_cut)) {
+				VERBOSE_MSG(qry, "=> no NS with an address\n");
+			} else {
+				VERBOSE_MSG(qry, "=> no valid NS left\n");
+			}
+			if (!qry->flags.NO_NS_FOUND) {
+				qry->flags.NO_NS_FOUND = true;
+			} else {
+				ITERATE_LAYERS(request, qry, reset);
+				kr_rplan_pop(rplan, qry);
+			}
+			return KR_STATE_PRODUCE;
+		}
 	} else if (!qry->ns.name || !retry) { /* Keep NS when requerying/stub/badcookie. */
 		/* Root DNSKEY must be fetched from the hints to avoid chicken and egg problem. */
 		if (qry->sname[0] == '\0' && qry->stype == KNOT_RRTYPE_DNSKEY) {