mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

Merge branch '16-cleanup-finds-before-sending-final-query' into 'master'

Browse Source 
Cleanup fctx->finds before sending 'final' query after qname minimization.

Closes #16

See merge request isc-projects/bind9!962
This commit is contained in:
Witold Krecicki
2018-11-05 05:06:32 -05:00
parent d88efa7e40 2d0a33208c
commit ae5c86ba9a
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
5075. [bug] Refresh nameservers from cache when sending final
query in qname minimization. [GL #16]
5074. [cleanup] Remove vector socket functions - isc_socket_recvv(),
isc_socket_sendtov(), isc_socket_sendtov2(),
isc_socket_sendv() - in order to simplify socket code.

9
lib/dns/resolver.c
View File

@@ -4143,6 +4143,15 @@ resume_qmin(isc_task_t *task, isc_event_t *event) {
fctx->ns_ttl = fctx->nameservers.ttl;
fctx->ns_ttl_ok = true;
fctx_minimize_qname(fctx);
if (!fctx->minimized) {
/*
* We have finished minimizing, but fctx->finds was filled at
* the beginning of the run - now we need to clear it before
* sending the final query to use proper nameservers.
*/
fctx_cancelqueries(fctx, false, false);
fctx_cleanupall(fctx);
}
fctx_try(fctx, true, false);
cleanup: