From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Mon, 3 Aug 2015 12:33:00 +0000 (+0200)
Subject: lib/resolve: count early finished requests as done
X-Git-Tag: v1.0.0-beta1~62^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d44c68a227665d4b749c8a75df101272f7dce4e0;p=thirdparty%2Fknot-resolver.git

lib/resolve: count early finished requests as done

this fixes stats for canceled/blocked or forwarded queries without
started name resolution
---

diff --git a/lib/resolve.c b/lib/resolve.c
index 54cc6d670..2a6cee3ec 100644
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -369,8 +369,11 @@ int kr_resolve_query(struct kr_request *request, const knot_dname_t *qname, uint
 	knot_wire_set_ra(answer->wire);
 	knot_wire_set_rcode(answer->wire, KNOT_RCODE_NOERROR);
 
-	/* Expect answer */
+	/* Expect answer, pop if satisfied immediately */
 	ITERATE_LAYERS(request, begin, request);
+	if (request->state == KNOT_STATE_DONE) {
+		kr_rplan_pop(rplan, qry);
+	}
 	return request->state;
 }