From 24fea48d7ba703ad00a08f628fe0a67601fe3bb0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 3 Apr 2017 15:05:16 +0200 Subject: [PATCH] iterate: improve get_initial_rank This fixes tests for hints, in particular. --- lib/layer/iterate.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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; -- 2.47.2