diff --git a/daemon/layer/query.c b/daemon/layer/query.c
index 927af06605cdbae91aef2ad8ed8ff1bbcf75f096..5dce26a95f70a84f0f6d43437f7d7668c2bffd0c 100644
--- a/daemon/layer/query.c
+++ b/daemon/layer/query.c
@@ -44,6 +44,11 @@ static int input_query(knot_layer_t *ctx, knot_pkt_t *pkt)
return KNOT_NS_PROC_NOOP; /* Ignore. */
}
+ /* No authoritative service. */
+ if (!knot_wire_get_rd(pkt->wire)) {
+ return KNOT_NS_PROC_FAIL;
+ }
+
return KNOT_NS_PROC_FULL;
}
@@ -64,6 +69,12 @@ static int output_answer(knot_layer_t *ctx, knot_pkt_t *pkt)
return KNOT_NS_PROC_DONE;
}
+static int output_error(knot_layer_t *ctx, knot_pkt_t *pkt)
+{
+ knot_wire_set_rcode(pkt->wire, KNOT_RCODE_SERVFAIL);
+ return KNOT_NS_PROC_DONE;
+}
+
/*! \brief Module implementation. */
static const knot_layer_api_t LAYER_QUERY_MODULE = {
&begin,
@@ -71,7 +82,7 @@ static const knot_layer_api_t LAYER_QUERY_MODULE = {
&reset,
&input_query,
&output_answer,
- NULL
+ &output_error
};
const knot_layer_api_t *layer_query_module(void)
diff --git a/daemon/worker.c b/daemon/worker.c
index 4a36655343c375cf44cfb7b9e14883a929069b11..4d0e351b889c26dc5012a9a2346abc2418726b66 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -81,7 +81,7 @@ int worker_exec(struct worker_ctx *worker, knot_pkt_t *answer, knot_pkt_t *query
int state = knot_layer_in(&proc, query);
/* Build an answer. */
- if (state == KNOT_NS_PROC_FULL) {
+ if (state & (KNOT_NS_PROC_FULL|KNOT_NS_PROC_FAIL)) {
knot_pkt_init_response(answer, query);
state = knot_layer_out(&proc, answer);
}
diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index a15c3292ecbafa977309a6a877188c8fd21239a9..a0ac5b851e5cc141cd973e1a9dff893c1193c905 100644
--- a/lib/layer/iterate.c
+++ b/lib/layer/iterate.c
@@ -25,6 +25,7 @@
#include "lib/resolve.h"
#include "lib/rplan.h"
#include "lib/defines.h"
+#include "lib/nsrep.h"
#define DEBUG_MSG(fmt...) QRDEBUG(kr_rplan_current(param->rplan), "iter", fmt)
@@ -76,6 +77,24 @@ static bool is_paired_to_query(const knot_pkt_t *answer, struct kr_query *query)
knot_dname_is_equal(qname, knot_pkt_qname(answer));
}
+/*! \brief Relaxed rule for AA, either AA=1 or SOA matching zone cut is required. */
+static bool is_authoritative(const knot_pkt_t *answer, struct kr_query *query)
+{
+ if (knot_wire_get_aa(answer->wire)) {
+ return true;
+ }
+
+ const knot_pktsection_t *ns = knot_pkt_section(answer, KNOT_AUTHORITY);
+ for (unsigned i = 0; i < ns->count; ++i) {
+ const knot_rrset_t *rr = knot_pkt_rr(ns, i);
+ if (rr->type == KNOT_RRTYPE_SOA && knot_dname_is_equal(rr->owner, query->zone_cut.name)) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
/*! \brief Return response class. */
static int response_classify(knot_pkt_t *pkt)
{
@@ -106,15 +125,14 @@ static void follow_cname_chain(const knot_dname_t **cname, const knot_rrset_t *r
static int update_nsaddr(const knot_rrset_t *rr, struct kr_query *query, uint16_t index)
{
- if (rr == NULL || query == NULL) {
- return KNOT_NS_PROC_MORE; /* Ignore */
- }
-
if (rr->type == KNOT_RRTYPE_A || rr->type == KNOT_RRTYPE_AAAA) {
if (knot_dname_is_equal(query->zone_cut.ns, rr->owner)) {
+ /* Set zone cut address. */
int ret = kr_set_zone_cut_addr(&query->zone_cut, rr, index);
if (ret == KNOT_EOK) {
return KNOT_NS_PROC_DONE;
+ } else {
+ return KNOT_NS_PROC_FAIL;
}
}
}
@@ -150,48 +168,88 @@ int rr_update_answer(const knot_rrset_t *rr, unsigned hint, struct kr_layer_para
return KNOT_NS_PROC_DONE;
}
-int rr_update_nameserver(const knot_rrset_t *rr, unsigned hint, struct kr_layer_param *param)
+static bool has_glue(const knot_dname_t *ns_name, knot_pkt_t *pkt)
+{
+ const knot_pktsection_t *ar = knot_pkt_section(pkt, KNOT_ADDITIONAL);
+ for (unsigned i = 0; i < ar->count; ++i) {
+ const knot_rrset_t *rr = knot_pkt_rr(ar, i);
+ if ((rr->type == KNOT_RRTYPE_A || rr->type == KNOT_RRTYPE_AAAA) &&
+ (knot_dname_is_equal(ns_name, rr->owner))) {
+ return true;
+ }
+ }
+ return false;
+}
+
+static int nameserver_score(const knot_rrset_t *rr, unsigned hint, knot_pkt_t *pkt, struct kr_layer_param *param)
{
struct kr_query *query = kr_rplan_current(param->rplan);
const knot_dname_t *ns_name = knot_ns_name(&rr->rrs, hint);
+ int score = kr_nsrep_score(rr->owner, param);
+ if (score < KR_NS_VALID) {
+ return score;
+ }
/* Authority MUST be at/below the authority of the nameserver, otherwise
* possible cache injection attempt. */
if (!knot_dname_in(query->zone_cut.name, rr->owner)) {
- DEBUG_MSG("NS in query outside of its authority => rejecting\n");
- return KNOT_NS_PROC_FAIL;
+ DEBUG_MSG("<= authority: ns outside bailiwick, rejecting\n");
+ return KR_NS_INVALID;
}
/* Ignore already resolved zone cut. */
if (knot_dname_is_equal(rr->owner, query->zone_cut.name)) {
- return KNOT_NS_PROC_MORE;
+ return KR_NS_VALID;
+ } else {
+ score += 1;
}
- /* Set zone cut to given name server. */
- kr_set_zone_cut(&query->zone_cut, rr->owner, ns_name);
- return KNOT_NS_PROC_DONE;
+ /* Check if contains glue. */
+ if (has_glue(ns_name, pkt)) {
+ score += 1;
+ }
+
+ return score;
}
static int process_authority(knot_pkt_t *pkt, struct kr_layer_param *param)
{
+ struct kr_query *query = kr_rplan_current(param->rplan);
+ const knot_rrset_t *best_ns = NULL;
+ int best_score = 0;
+
+ /* AA, terminate resolution chain. */
+ if (knot_wire_get_aa(pkt->wire)) {
+ return KNOT_NS_PROC_MORE;
+ }
+
+ /* Elect best name server candidate. */
const knot_pktsection_t *ns = knot_pkt_section(pkt, KNOT_AUTHORITY);
for (unsigned i = 0; i < ns->count; ++i) {
const knot_rrset_t *rr = knot_pkt_rr(ns, i);
if (rr->type == KNOT_RRTYPE_NS) {
- int state = rr_update_nameserver(rr, 0, param);
- if (state != KNOT_NS_PROC_MORE) {
- return state;
+ int score = nameserver_score(rr, 0, pkt, param);
+ if (score < KR_NS_VALID) {
+ return KNOT_NS_PROC_FAIL;
+ }
+ if (score > best_score) {
+ best_ns = rr;
+ best_score = score;
}
}
}
+ /* Update name server candidate. */
+ if (best_ns != NULL) {
+ kr_set_zone_cut(&query->zone_cut, best_ns->owner, knot_ns_name(&best_ns->rrs, 0));
+ return KNOT_NS_PROC_DONE;
+ }
+
return KNOT_NS_PROC_MORE;
}
static int process_additional(knot_pkt_t *pkt, struct kr_layer_param *param)
{
- struct kr_query *query = kr_rplan_current(param->rplan);
-
/* Attempt to find glue for current nameserver. */
const knot_pktsection_t *ar = knot_pkt_section(pkt, KNOT_ADDITIONAL);
for (unsigned i = 0; i < ar->count; ++i) {
@@ -202,13 +260,30 @@ static int process_additional(knot_pkt_t *pkt, struct kr_layer_param *param)
}
}
- /* Glue not found => resolve NS address. */
- (void) kr_rplan_push(param->rplan, query, query->zone_cut.ns, KNOT_CLASS_IN, KNOT_RRTYPE_AAAA);
- (void) kr_rplan_push(param->rplan, query, query->zone_cut.ns, KNOT_CLASS_IN, KNOT_RRTYPE_A);
-
return KNOT_NS_PROC_DONE;
}
+static void finalize_answer(knot_pkt_t *pkt, struct kr_layer_param *param)
+{
+ /* Finalize header */
+ knot_pkt_t *answer = param->answer;
+ knot_wire_set_rcode(answer->wire, knot_wire_get_rcode(pkt->wire));
+
+ /* Fill in SOA if negative response */
+ knot_pkt_begin(answer, KNOT_AUTHORITY);
+ int pkt_class = response_classify(pkt);
+ if (pkt_class & (PKT_NXDOMAIN|PKT_NODATA)) {
+ const knot_pktsection_t *ns = knot_pkt_section(pkt, KNOT_AUTHORITY);
+ for (unsigned i = 0; i < ns->count; ++i) {
+ const knot_rrset_t *rr = knot_pkt_rr(ns, i);
+ if (rr->type == KNOT_RRTYPE_SOA) {
+ rr_update_answer(rr, 0, param);
+ break;
+ }
+ }
+ }
+}
+
static int process_answer(knot_pkt_t *pkt, struct kr_layer_param *param)
{
struct kr_query *query = kr_rplan_current(param->rplan);
@@ -225,6 +300,12 @@ static int process_answer(knot_pkt_t *pkt, struct kr_layer_param *param)
return KNOT_NS_PROC_DONE;
}
+ /* This answer didn't improve resolution chain, therefore must be authoritative (relaxed to negative). */
+ if (!is_authoritative(pkt, query) && (pkt_class & (PKT_NXDOMAIN|PKT_NODATA))) {
+ DEBUG_MSG("<= lame response: non-auth sent negative response\n");
+ return KNOT_NS_PROC_FAIL;
+ }
+
/* Process answer type */
const knot_pktsection_t *an = knot_pkt_section(pkt, KNOT_ANSWER);
const knot_dname_t *cname = query->sname;
@@ -240,38 +321,17 @@ static int process_answer(knot_pkt_t *pkt, struct kr_layer_param *param)
/* Follow canonical name as next SNAME. */
if (cname != query->sname) {
(void) kr_rplan_push(param->rplan, query->parent, cname, query->sclass, query->stype);
+ } else {
+ if (query->parent == NULL) {
+ finalize_answer(pkt, param);
+ }
}
/* Either way it resolves current query. */
- kr_rplan_pop(param->rplan, query);
-
+ query->resolved = true;
return KNOT_NS_PROC_DONE;
}
-static void finalize_answer(knot_pkt_t *pkt, struct kr_layer_param *param)
-{
- knot_pkt_t *answer = param->answer;
-
- /* Finalize header */
- knot_wire_set_rcode(answer->wire, knot_wire_get_rcode(pkt->wire));
-
- /* Finalize authority */
- knot_pkt_begin(answer, KNOT_AUTHORITY);
-
- /* Fill in SOA if negative response */
- int pkt_class = response_classify(pkt);
- if (pkt_class & (PKT_NXDOMAIN|PKT_NODATA)) {
- const knot_pktsection_t *ns = knot_pkt_section(pkt, KNOT_AUTHORITY);
- for (unsigned i = 0; i < ns->count; ++i) {
- const knot_rrset_t *rr = knot_pkt_rr(ns, i);
- if (rr->type == KNOT_RRTYPE_SOA) {
- rr_update_answer(rr, 0, param);
- break;
- }
- }
- }
-}
-
/*! \brief Error handling, RFC1034 5.3.3, 4d. */
static int resolve_error(knot_pkt_t *pkt, struct kr_layer_param *param)
{
@@ -327,10 +387,11 @@ static int prepare_query(knot_layer_t *ctx, knot_pkt_t *pkt)
}
#ifndef NDEBUG
- char zonecut_str[KNOT_DNAME_MAXLEN], ns_str[KNOT_DNAME_MAXLEN];
+ char qname_str[KNOT_DNAME_MAXLEN], zonecut_str[KNOT_DNAME_MAXLEN], ns_str[KNOT_DNAME_MAXLEN];
+ knot_dname_to_str(qname_str, qname, sizeof(qname_str));
knot_dname_to_str(ns_str, query->zone_cut.ns, sizeof(ns_str));
knot_dname_to_str(zonecut_str, query->zone_cut.name, sizeof(zonecut_str));
- DEBUG_MSG("=> querying nameserver '%s' zone cut '%s'\n", ns_str, zonecut_str);
+ DEBUG_MSG("=> querying: '%s' zone cut: '%s' m12n: '%s'\n", ns_str, zonecut_str, qname_str);
#endif
/* Query built, expect answer. */
@@ -346,24 +407,24 @@ static int resolve(knot_layer_t *ctx, knot_pkt_t *pkt)
assert(pkt && ctx);
struct kr_layer_param *param = ctx->data;
struct kr_query *query = kr_rplan_current(param->rplan);
- if (query == NULL) {
+ if (query == NULL || query->resolved) {
return ctx->state;
}
/* Check for packet processing errors first. */
if (pkt->parsed < pkt->size) {
- DEBUG_MSG("=> malformed response\n");
+ DEBUG_MSG("<= malformed response\n");
return resolve_error(pkt, param);
} else if (!is_paired_to_query(pkt, query)) {
- DEBUG_MSG("=> ignoring mismatching response\n");
+ DEBUG_MSG("<= ignoring mismatching response\n");
return KNOT_NS_PROC_MORE;
} else if (knot_wire_get_tc(pkt->wire)) {
- DEBUG_MSG("=> truncated response, failover to TCP\n");
+ DEBUG_MSG("<= truncated response, failover to TCP\n");
struct kr_query *cur = kr_rplan_current(param->rplan);
if (cur) {
/* Fail if already on TCP. */
if (cur->flags & QUERY_TCP) {
- DEBUG_MSG("=> TC=1 with TCP, bailing out\n");
+ DEBUG_MSG("<= TC=1 with TCP, bailing out\n");
return resolve_error(pkt, param);
}
cur->flags |= QUERY_TCP;
@@ -372,12 +433,13 @@ static int resolve(knot_layer_t *ctx, knot_pkt_t *pkt)
}
/* Check response code. */
+ lookup_table_t *rcode = lookup_by_id(knot_rcode_names, knot_wire_get_rcode(pkt->wire));
switch(knot_wire_get_rcode(pkt->wire)) {
case KNOT_RCODE_NOERROR:
case KNOT_RCODE_NXDOMAIN:
break; /* OK */
default:
- DEBUG_MSG("=> rcode: %d\n", knot_wire_get_rcode(pkt->wire));
+ DEBUG_MSG("<= rcode: %s\n", rcode ? rcode->name : "??");
return resolve_error(pkt, param);
}
@@ -386,22 +448,17 @@ static int resolve(knot_layer_t *ctx, knot_pkt_t *pkt)
state = process_authority(pkt, param);
switch(state) {
case KNOT_NS_PROC_MORE: /* Not referral, process answer. */
- DEBUG_MSG("=> rcode: %d\n", knot_wire_get_rcode(pkt->wire));
+ DEBUG_MSG("<= rcode: %s\n", rcode ? rcode->name : "??");
state = process_answer(pkt, param);
break;
case KNOT_NS_PROC_DONE: /* Referral, try to find glue. */
- DEBUG_MSG("=> referral response, follow\n");
+ DEBUG_MSG("<= referral response, follow\n");
state = process_additional(pkt, param);
break;
default:
break;
}
- /* If resolved, finalize answer. */
- if (kr_rplan_empty(param->rplan)) {
- finalize_answer(pkt, param);
- }
-
return state;
}
diff --git a/lib/layer/iterate.h b/lib/layer/iterate.h
index f9338c73196dcf506b2986742cfe1df0b4686193..a5821ac9bc7bd51f88a7d7fbe450d58019e0cdd4 100644
--- a/lib/layer/iterate.h
+++ b/lib/layer/iterate.h
@@ -33,9 +33,3 @@ int rr_update_parent(const knot_rrset_t *rr, unsigned hint, struct kr_layer_para
* \note When \a hint is KNOT_PF_FREE, RR is treated as a copy and answer takes its ownership.
*/
int rr_update_answer(const knot_rrset_t *rr, unsigned hint, struct kr_layer_param *param);
-
-/*!
- * \brief Result updates current nameserver.
- * \note Hint is an index of chosen RR in the set.
- */
-int rr_update_nameserver(const knot_rrset_t *rr, unsigned hint, struct kr_layer_param *param);
diff --git a/lib/layer/itercache.c b/lib/layer/itercache.c
index a35a80791cfa7d876a4d695ad17de9afe6da1a90..0b0e501fe49c71a9a3f3e640989b8e98be3f5ab6 100644
--- a/lib/layer/itercache.c
+++ b/lib/layer/itercache.c
@@ -247,7 +247,6 @@ static int write_cache(knot_layer_t *ctx, knot_pkt_t *pkt)
/* Cache only positive answers. */
/*! \todo Negative answers cache support */
if (knot_wire_get_rcode(pkt->wire) != KNOT_RCODE_NOERROR) {
- DEBUG_MSG("write NCACHE (NOTIMPL)\n");
return ctx->state;
}
diff --git a/lib/libkresolve.mk b/lib/libkresolve.mk
index 09a1badb4ff040e9e34c579bed71cf93c6e2b1f5..9dddbb69b519d0332592a141d0c5075795a8de58 100644
--- a/lib/libkresolve.mk
+++ b/lib/libkresolve.mk
@@ -3,6 +3,7 @@ libkresolve_SOURCES := \
lib/layer/itercache.c \
lib/layer/static.c \
lib/layer/stats.c \
+ lib/nsrep.c \
lib/context.c \
lib/resolve.c \
lib/zonecut.c \
@@ -15,6 +16,7 @@ libkresolve_HEADERS := \
lib/layer/static.h \
lib/layer/stats.h \
lib/layer.h \
+ lib/nsrep.h \
lib/context.h \
lib/resolve.h \
lib/zonecut.h \
diff --git a/lib/nsrep.c b/lib/nsrep.c
new file mode 100644
index 0000000000000000000000000000000000000000..bc19c28c1204b419208ceea68d04e7cc50670629
--- /dev/null
+++ b/lib/nsrep.c
@@ -0,0 +1,7 @@
+#include "lib/nsrep.h"
+
+int kr_nsrep_score(const knot_dname_t *ns, struct kr_layer_param *param)
+{
+ /* TODO: stub, always returns valid */
+ return KR_NS_VALID;
+}
\ No newline at end of file
diff --git a/lib/nsrep.h b/lib/nsrep.h
new file mode 100644
index 0000000000000000000000000000000000000000..3c1c566862965e9f49753cc5307ff06ece1f5a32
--- /dev/null
+++ b/lib/nsrep.h
@@ -0,0 +1,31 @@
+/* Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "lib/layer.h"
+
+enum kr_ns_score {
+ KR_NS_INVALID = -1,
+ KR_NS_VALID = 0
+};
+
+/*! \brief Return name server score (KR_NS_VALID is baseline, the higher the better).
+ * \param ns evaluated NS name
+ * \param param layer parameters
+ * \return enum kr_ns_score or higher positive value
+ */
+int kr_nsrep_score(const knot_dname_t *ns, struct kr_layer_param *param);
\ No newline at end of file
diff --git a/lib/resolve.c b/lib/resolve.c
index 1ba465a50dea2579e6f549e555d30bd49078171c..495ead18555e656911919ee5fd154d1931eb388f 100755
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -18,6 +18,7 @@
#include <libknot/internal/mempool.h>
#include <libknot/processing/requestor.h>
+#include <libknot/rrtype/rdname.h>
#include <libknot/descriptor.h>
#include <dnssec/random.h>
@@ -64,15 +65,31 @@ static int invalidate_ns(struct kr_rplan *rplan, struct kr_query *qry)
knot_rdataset_clear(&to_remove, rplan->pool);
/* Remove record(s) */
+ int ret = KNOT_EOK;
if (cached.rrs.rr_count == 0) {
(void) kr_cache_remove(txn, &cached);
+ ret = KNOT_ENOENT;
} else {
(void) kr_cache_insert(txn, &cached, qry->timestamp.tv_sec);
+ kr_set_zone_cut(&qry->zone_cut, cached.owner, knot_ns_name(&cached.rrs, 0));
}
+
knot_rrset_clear(&cached, rplan->pool);
+ return ret;
+}
- /* Update zone cut and continue. */
- return kr_find_zone_cut(&qry->zone_cut, qry->sname, txn, qry->timestamp.tv_sec);
+static int ns_resolve_addr(struct kr_query *cur, struct kr_layer_param *param)
+{
+ if (kr_rplan_satisfies(cur, cur->zone_cut.ns, KNOT_CLASS_IN, KNOT_RRTYPE_A) ||
+ kr_rplan_satisfies(cur, cur->zone_cut.ns, KNOT_CLASS_IN, KNOT_RRTYPE_AAAA)) {
+ DEBUG_MSG("=> dependency loop, bailing out\n");
+ kr_rplan_pop(param->rplan, cur);
+ return KNOT_EOK;
+ }
+
+ (void) kr_rplan_push(param->rplan, cur, cur->zone_cut.ns, KNOT_CLASS_IN, KNOT_RRTYPE_AAAA);
+ (void) kr_rplan_push(param->rplan, cur, cur->zone_cut.ns, KNOT_CLASS_IN, KNOT_RRTYPE_A);
+ return KNOT_EOK;
}
static int iterate(struct knot_requestor *requestor, struct kr_layer_param *param)
@@ -91,8 +108,8 @@ static int iterate(struct knot_requestor *requestor, struct kr_layer_param *para
/* Invalid address for current zone cut. */
if (sockaddr_len((struct sockaddr *)&cur->zone_cut.addr) < 1) {
- DEBUG_MSG("=> ns missing A/AAAA, invalidating\n");
- return invalidate_ns(rplan, cur);
+ DEBUG_MSG("=> ns missing A/AAAA, fetching\n");
+ return ns_resolve_addr(cur, param);
}
/* Prepare query resolution. */
@@ -105,11 +122,6 @@ static int iterate(struct knot_requestor *requestor, struct kr_layer_param *para
/* Resolve and check status. */
ret = knot_requestor_exec(requestor, &timeout);
if (ret != KNOT_EOK) {
- /* Check if any query is left. */
- cur = kr_rplan_current(rplan);
- if (cur == NULL) {
- return ret;
- }
/* Network error, retry over TCP. */
if (ret != KNOT_LAYER_ERROR && !(cur->flags & QUERY_TCP)) {
DEBUG_MSG("=> ns unreachable, retrying over TCP\n");
@@ -118,8 +130,18 @@ static int iterate(struct knot_requestor *requestor, struct kr_layer_param *para
}
/* Resolution failed, invalidate current NS and reset to UDP. */
DEBUG_MSG("=> resolution failed: '%s', invalidating\n", knot_strerror(ret));
- ret = invalidate_ns(rplan, cur);
- cur->flags &= ~QUERY_TCP;
+ if (invalidate_ns(rplan, cur) == KNOT_EOK) {
+ cur->flags &= ~QUERY_TCP;
+ } else {
+ DEBUG_MSG("=> no ns left to ask\n");
+ kr_rplan_pop(rplan, cur);
+ }
+ return KNOT_EOK;
+ }
+
+ /* Pop query if resolved. */
+ if (cur->resolved) {
+ kr_rplan_pop(rplan, cur);
}
return ret;
diff --git a/lib/rplan.c b/lib/rplan.c
index d0cb9bba02b8f17d77360a2918db72c0953727fb..713e8093eedd6938c62965afbea98c619063dbf4 100644
--- a/lib/rplan.c
+++ b/lib/rplan.c
@@ -25,6 +25,8 @@
#include "lib/layer.h"
#define DEBUG_MSG(qry, fmt...) QRDEBUG(qry, "plan", fmt)
+#define QUERY_PROVIDES(q, name, cls, type) \
+ ((q)->sclass == (cls) && (q)->stype == type && knot_dname_is_equal((q)->sname, name))
static struct kr_query *query_create(mm_ctx_t *pool, const knot_dname_t *name)
{
@@ -102,34 +104,31 @@ bool kr_rplan_empty(struct kr_rplan *rplan)
struct kr_query *kr_rplan_push(struct kr_rplan *rplan, struct kr_query *parent,
const knot_dname_t *name, uint16_t cls, uint16_t type)
{
- if (rplan == NULL) {
+ if (rplan == NULL || name == NULL) {
return NULL;
}
- struct kr_query *qry = query_create(rplan->pool, name);
+ struct kr_query *qry = query_create(rplan->pool, name);
if (qry == NULL) {
return NULL;
}
-
qry->sclass = cls;
qry->stype = type;
qry->flags = rplan->context->options;
+ qry->parent = parent;
gettimeofday(&qry->timestamp, NULL);
+ add_tail(&rplan->pending, &qry->node);
/* Find closest zone cut for this query. */
namedb_txn_t *txn = kr_rplan_txn_acquire(rplan, NAMEDB_RDONLY);
kr_find_zone_cut(&qry->zone_cut, name, txn, qry->timestamp.tv_sec);
- add_tail(&rplan->pending, &qry->node);
- qry->parent = parent;
-
#ifndef NDEBUG
char name_str[KNOT_DNAME_MAXLEN], type_str[16];
knot_dname_to_str(name_str, name, sizeof(name_str));
knot_rrtype_to_string(type, type_str, sizeof(type_str));
DEBUG_MSG(parent, "plan '%s' type '%s'\n", name_str, type_str);
#endif
-
return qry;
}
@@ -200,3 +199,13 @@ int kr_rplan_txn_commit(struct kr_rplan *rplan)
return ret;
}
+bool kr_rplan_satisfies(struct kr_query *closure, const knot_dname_t *name, uint16_t cls, uint16_t type)
+{
+ while (closure != NULL) {
+ if (QUERY_PROVIDES(closure, name, cls, type)) {
+ return true;
+ }
+ closure = closure->parent;
+ }
+ return false;
+}
diff --git a/lib/rplan.h b/lib/rplan.h
index c9771b07e7178c62072a21e2fb4c2bc40265d0cb..adceee5d1ccdb3d2fbfa7ffd4422c12e087486d9 100644
--- a/lib/rplan.h
+++ b/lib/rplan.h
@@ -27,7 +27,7 @@
#include "lib/zonecut.h"
/* Query flags */
-enum {
+enum kr_query_flag {
QUERY_NO_MINIMIZE = 1 << 0, /*!< Don't minimize QNAME. */
QUERY_TCP = 1 << 1 /*!< Use TCP for this query. */
};
@@ -41,6 +41,7 @@ struct kr_query {
struct kr_zonecut zone_cut;
struct timeval timestamp;
knot_dname_t *sname;
+ bool resolved;
uint16_t stype;
uint16_t sclass;
uint16_t id;
@@ -129,3 +130,8 @@ int kr_rplan_pop(struct kr_rplan *rplan, struct kr_query *qry);
* \return query instance or NULL if empty
*/
struct kr_query *kr_rplan_current(struct kr_rplan *rplan);
+
+/*!
+ * \brief Return true if resolution chain satisfies given query.
+ */
+bool kr_rplan_satisfies(struct kr_query *closure, const knot_dname_t *name, uint16_t cls, uint16_t type);
diff --git a/tests/pydnstest/scenario.py b/tests/pydnstest/scenario.py
index 5d1d89f95ce0d42f739e8d01367a4c7221515e54..6170724e133219dd2143faa46297f545f89cf7eb 100644
--- a/tests/pydnstest/scenario.py
+++ b/tests/pydnstest/scenario.py
@@ -28,10 +28,16 @@ class Entry:
if code == 'opcode':
return self.__compare_val(expected.opcode(), msg.opcode())
elif code == 'qtype':
+ if len(expected.question) == 0:
+ return True
return self.__compare_val(expected.question[0].rdtype, msg.question[0].rdtype)
elif code == 'qname':
+ if len(expected.question) == 0:
+ return True
return self.__compare_val(expected.question[0].name, msg.question[0].name)
elif code == 'subdomain':
+ if len(expected.question) == 0:
+ return True
return self.__compare_sub(expected.question[0].name, msg.question[0].name)
elif code == 'flags':
return self.__compare_val(dns.flags.to_text(expected.flags), dns.flags.to_text(msg.flags))
diff --git a/tests/testdata_notimpl/iter_lame_noaa.rpl b/tests/testdata/iter_lame_noaa.rpl
similarity index 65%
rename from tests/testdata_notimpl/iter_lame_noaa.rpl
rename to tests/testdata/iter_lame_noaa.rpl
index e6136473f6b45625a3316d19b7bac33463ebae29..44533b69678ea33898378dc308372fae677e9e16 100644
--- a/tests/testdata_notimpl/iter_lame_noaa.rpl
+++ b/tests/testdata/iter_lame_noaa.rpl
@@ -24,12 +24,6 @@ www.example.com. IN A
ENTRY_END
; root prime is sent
-STEP 20 CHECK_OUT_QUERY
-ENTRY_BEGIN
-MATCH qname qtype opcode
-SECTION QUESTION
-. IN NS
-ENTRY_END
STEP 30 REPLY
ENTRY_BEGIN
MATCH opcode qtype qname
@@ -44,12 +38,6 @@ K.ROOT-SERVERS.NET. IN A 193.0.14.129
ENTRY_END
; query sent to root server
-STEP 40 CHECK_OUT_QUERY
-ENTRY_BEGIN
-MATCH qname qtype opcode
-SECTION QUESTION
-www.example.com. IN A
-ENTRY_END
STEP 50 REPLY
ENTRY_BEGIN
MATCH opcode qtype qname
@@ -64,34 +52,6 @@ a.gtld-servers.net. IN A 192.5.6.30
ENTRY_END
; query sent to .com server
-STEP 60 CHECK_OUT_QUERY
-ENTRY_BEGIN
-MATCH qname qtype opcode
-SECTION QUESTION
-www.example.com. IN A
-ENTRY_END
-
-; answer the NS queries that have been generated
-; STEP 62 CHECK_OUT_QUERY
-; ENTRY_BEGIN
-; MATCH qname qtype opcode
-; SECTION QUESTION
-; com. IN NS
-; ENTRY_END
-;
-; STEP 63 REPLY
-; ; ENTRY_BEGIN
-; MATCH opcode qtype qname
-; ADJUST copy_id
-; REPLY QR AA NOERROR
-; SECTION QUESTION
-; com. IN NS
-; SECTION ANSWER
-; com. IN NS a.gtld-servers.net.
-; SECTION ADDITIONAL
-; a.gtld-servers.net. IN A 192.5.6.30
-; ENTRY_END
-
STEP 70 REPLY
ENTRY_BEGIN
MATCH opcode qtype qname
@@ -109,35 +69,6 @@ ENTRY_END
; no matter which one the iterator tries first, we present it as 'lame'
; query to ns1.example.com or ns2.example.com.
-STEP 80 CHECK_OUT_QUERY
-ENTRY_BEGIN
-MATCH qname qtype opcode
-SECTION QUESTION
-www.example.com. IN A
-ENTRY_END
-
-; STEP 82 CHECK_OUT_QUERY
-; ENTRY_BEGIN
-; MATCH qname qtype opcode
-; SECTION QUESTION
-; example.com. IN NS
-; ENTRY_END
-;
-; STEP 83 REPLY
-; ENTRY_BEGIN
-; MATCH opcode qtype qname
-; ADJUST copy_id
-; REPLY QR AA NOERROR
-; SECTION QUESTION
-; example.com. IN NS
-; SECTION ANSWER
-; example.com. IN NS ns1.example.com.
-; example.com. IN NS ns2.example.com.
-; SECTION ADDITIONAL
-; ns1.example.com. IN A 168.192.2.2
-; ns2.example.com. IN A 168.192.3.3
-; ENTRY_END
-;
STEP 90 REPLY
ENTRY_BEGIN
MATCH opcode qtype qname
@@ -156,13 +87,6 @@ ns2.example.com. IN A 168.192.3.3
ENTRY_END
; iterator should try again and ask the other nameserver.
-STEP 100 CHECK_OUT_QUERY
-ENTRY_BEGIN
-MATCH qname qtype opcode
-SECTION QUESTION
-www.example.com. IN A
-ENTRY_END
-
STEP 110 REPLY
ENTRY_BEGIN
MATCH opcode qtype qname
diff --git a/tests/testdata_notimpl/iter_lame_nosoa.rpl b/tests/testdata/iter_lame_nosoa.rpl
similarity index 100%
rename from tests/testdata_notimpl/iter_lame_nosoa.rpl
rename to tests/testdata/iter_lame_nosoa.rpl
diff --git a/tests/testdata/iter_minim_ns.rpl b/tests/testdata/iter_minim_ns.rpl
index 34da53be6ab0bd5439cbc22fe636033eea7de668..02709db19e00492ee3dfbf9720399b8ad2211e2f 100644
--- a/tests/testdata/iter_minim_ns.rpl
+++ b/tests/testdata/iter_minim_ns.rpl
@@ -25,6 +25,34 @@ SECTION ADDITIONAL
K.ROOT-SERVERS.NET. IN A 193.0.14.129
ENTRY_END
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+net. IN NS
+SECTION ANSWER
+net. IN NS K.ROOT-SERVERS.NET.
+SECTION ADDITIONAL
+K.ROOT-SERVERS.NET. IN A 193.0.14.129
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+gtld-servers.net. IN NS
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA NOERROR
+SECTION QUESTION
+a.gtld-servers.net. IN AAAA
+ENTRY_END
+
ENTRY_BEGIN
MATCH opcode qtype qname
ADJUST copy_id
@@ -36,7 +64,6 @@ com. IN NS lame-addr.gtld-servers.net.
com. IN NS a.gtld-servers.net.
SECTION ADDITIONAL
lame-addr.gtld-servers.net. IN A 1.1.1.1
-a.gtld-servers.net. IN A 1.1.1.1
a.gtld-servers.net. IN A 192.5.6.30
ENTRY_END
RANGE_END
@@ -64,7 +91,7 @@ ENTRY_END
ENTRY_BEGIN
MATCH opcode qtype qname
ADJUST copy_id
-REPLY QR NOERROR
+REPLY QR AA NOERROR
SECTION QUESTION
www.example.com. IN NS
SECTION ANSWER