- Don't count CNAME response types received during qname minimisation as query

restart.


git-svn-id: file:///svn/unbound/trunk@4728 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Ralph Dolmans 2018-06-12 13:09:14 +00:00
parent d6ed0e868f
commit 00a0cabf7f
2 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,7 @@
12 June 2018: Ralph
- Don't count CNAME response types received during qname minimisation as
query restart.
12 June 2018: Wouter 12 June 2018: Wouter
- #4102 for NSD, but for Unbound. Named unix pipes do not use - #4102 for NSD, but for Unbound. Named unix pipes do not use
certificate and key files, access can be restricted with file and certificate and key files, access can be restricted with file and

View file

@ -2770,16 +2770,18 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
/* set the current request's qname to the new value. */ /* set the current request's qname to the new value. */
iq->qchase.qname = sname; iq->qchase.qname = sname;
iq->qchase.qname_len = snamelen; iq->qchase.qname_len = snamelen;
if (qstate->env->cfg->qname_minimisation)
iq->minimisation_state = INIT_MINIMISE_STATE;
/* Clear the query state, since this is a query restart. */ /* Clear the query state, since this is a query restart. */
iq->deleg_msg = NULL; iq->deleg_msg = NULL;
iq->dp = NULL; iq->dp = NULL;
iq->dsns_point = NULL; iq->dsns_point = NULL;
iq->auth_zone_response = 0; iq->auth_zone_response = 0;
/* Note the query restart. */
iq->query_restart_count++;
iq->sent_count = 0; iq->sent_count = 0;
if(iq->minimisation_state != MINIMISE_STATE)
/* Only count as query restart when it is not an extra
* query as result of qname minimisation. */
iq->query_restart_count++;
if(qstate->env->cfg->qname_minimisation)
iq->minimisation_state = INIT_MINIMISE_STATE;
/* stop current outstanding queries. /* stop current outstanding queries.
* FIXME: should the outstanding queries be waited for and * FIXME: should the outstanding queries be waited for and