lib: cleanup

diff --git a/lib/resolve.c b/lib/resolve.c
index 23e56f5375de34bc910832d2785ab118515b06dd..d71532ad42bfa1978602a1935c3ec728e39f390e 100644 (file)
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -94,7 +94,7 @@ static int ns_resolve_addr(struct kr_query *qry, struct kr_request *param)
        if (!next_type || kr_rplan_satisfies(qry->parent, qry->ns.name, KNOT_CLASS_IN, next_type)) {
                /* No IPv4 nor IPv6, flag server as unuseable. */
                DEBUG_MSG("=> unresolvable NS address, bailing out\n");
-               kr_nsrep_update_rep(&qry->ns, qry->ns.reputation | KR_NS_NOIP6, ctx->cache_rep);
+               kr_nsrep_update_rep(&qry->ns, qry->ns.reputation | KR_NS_NOIP4, ctx->cache_rep);
                invalidate_ns(rplan, qry);
                return kr_error(EHOSTUNREACH);
        }
@@ -383,7 +383,7 @@ int kr_resolve_consume(struct kr_request *request, knot_pkt_t *packet)
        /* Resolution failed, invalidate current NS. */
        if (state == KNOT_STATE_FAIL) {
                kr_nsrep_update_rtt(&qry->ns, KR_NS_TIMEOUT, ctx->cache_rtt);
-               invalidate_ns(rplan, qry); /* @note Stay with TCP as it's likely this is broken delegation. */
+               invalidate_ns(rplan, qry);
        /* Track RTT for iterative answers */
        } else if (!(qry->flags & QUERY_CACHED)) {
                struct timeval now;
@@ -395,7 +395,7 @@ int kr_resolve_consume(struct kr_request *request, knot_pkt_t *packet)
        if (qry->flags & QUERY_RESOLVED) {
                kr_rplan_pop(rplan, qry);
        } else { /* Clear query flags for next attempt */
-               qry->flags &= ~QUERY_CACHED;
+               qry->flags &= ~(QUERY_CACHED|QUERY_TCP);
        }
 
        knot_overlay_reset(&request->overlay);

diff --git a/lib/zonecut.c b/lib/zonecut.c
index 8894b70313eaafc8f00d81edea74c8d44e7759b0..120e5b2aade6c34324a8c500d3ee5fd87ce373d7 100644 (file)
--- a/lib/zonecut.c
+++ b/lib/zonecut.c
@@ -302,9 +302,6 @@ int kr_zonecut_find_cached(struct kr_context *ctx, struct kr_zonecut *cut, const
        }
 
        /* Start at QNAME parent. */
-       if (name[0] != '\0') {
-               name = knot_wire_next_label(name, NULL);
-       }
        while (txn) {
                if (fetch_ns(ctx, cut, name, txn, timestamp) == 0) {
                        update_cut_name(cut, name);

diff --git a/modules/block/block.lua b/modules/block/block.lua
index d7461e0157beba070beea4090809a6f8cb98ef17..348471e3bcea1e3ccb3154ae296e344e3d450762 100644 (file)
--- a/modules/block/block.lua
+++ b/modules/block/block.lua
@@ -108,7 +108,7 @@ block.layer = {
                        -- Answer full question
                        local qclass = kres.query_qclass(qry)
                        local qtype = kres.query_qtype(qry)
-                       kres.query_flag(qry, kres.query.NO_MINIMIZE + kres.query.CACHED)
+                       kres.query_flag(qry, kres.query.NO_MINIMIZE)
                        pkt:question(qname, qclass, qtype)
                        pkt:flag(kres.wire.QR)
                        pkt:flag(kres.wire.AA)