From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 3 Apr 2017 13:05:16 +0000 (+0200)
Subject: iterate: improve get_initial_rank
X-Git-Tag: v1.3.0~23^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24fea48d7ba703ad00a08f628fe0a67601fe3bb0;p=thirdparty%2Fknot-resolver.git

iterate: improve get_initial_rank

This fixes tests for hints, in particular.
---

diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index bfddbb232..f2f813ce8 100644
--- a/lib/layer/iterate.c
+++ b/lib/layer/iterate.c
@@ -298,9 +298,11 @@ static inline uint8_t get_initial_rank(const knot_rrset_t *rr,
 	const uint32_t qflags = qry->flags;
 	uint8_t rank = 0;
 	if (qflags & QUERY_CACHED) {
-		assert(rr->additional);
-		rank = *(uint8_t *)rr->additional;
-	} else if (answer) {
+		rank = rr->additional ? *(uint8_t *)rr->additional : KR_RANK_OMIT;
+		/* ^^ Current use case for "cached" RRs without rank: hints module. */
+	} else if (answer || rr->type == KNOT_RRTYPE_DS
+		   || rr->type == KNOT_RRTYPE_NSEC || rr->type == KNOT_RRTYPE_NSEC3) {
+		/* TODO: this classifier of authoritativity may not be perfect yet. */
 		rank |= KR_RANK_AUTH;
 	}
 	return (uint8_t)rank;