WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-08-17 21:25:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpz: apply trigger at query time not response time

Browse Source
This commit is contained in:
mb
2020-11-24 09:33:08 +01:00
parent f7fb338c95
commit 354c19f6ac
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iterator/iterator.c
+5 -3
View File
@@ -2471,6 +2471,8 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
/* Add the current set of unused targets to our queue. */
delegpt_add_unused_targets(iq->dp);
rpz_iterator_module_callback(qstate, iq);
/* Select the next usable target, filtering out unsuitable targets. */
target = iter_server_selection(ie, qstate->env, iq->dp,
iq->dp->name, iq->dp->namelen, iq->qchase.qtype,
@@ -2660,15 +2662,15 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
{
int dnsseclame = 0;
enum response_type type;
int rpz_filter_result;
//int rpz_filter_result;
iq->num_current_queries--;
if(!inplace_cb_query_response_call(qstate->env, qstate, iq->response))
log_err("unable to call query_response callback");
rpz_filter_result = rpz_iterator_module_callback(qstate, iq);
if(rpz_filter_result > 0) { next_state(iq, FINISHED_STATE); }
//rpz_filter_result = rpz_iterator_module_callback(qstate, iq);
//if(rpz_filter_result > 0) { next_state(iq, FINISHED_STATE); }
if(iq->response == NULL) {
/* Don't increment qname when QNAME minimisation is enabled */