upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for dns64 readability refactoring:

Browse source 
- Move declarations to the top for C90 compliance.
- Save cycles by not calling (yet) unneeded functions.
- Possible use of uninitialised value.
- Consistent formatting.
This commit is contained in:
George Thessalonikefs 2023-10-17 15:00:07 +02:00
parent 213bb7c6ed
commit dd086e5bfd
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
dns64/dns64.c
View file

@ -573,28 +573,29 @@ static enum module_ext_state
handle_event_pass(struct module_qstate* qstate, int id) handle_event_pass(struct module_qstate* qstate, int id)
{ {
struct dns64_qstate* iq = (struct dns64_qstate*)qstate->minfo[id]; struct dns64_qstate* iq = (struct dns64_qstate*)qstate->minfo[id];
if (iq && iq->state == DNS64_NEW_QUERY int synth_all_cfg = qstate->env->cfg->dns64_synthall;
int synth_qname = 0;
if(iq && iq->state == DNS64_NEW_QUERY
&& qstate->qinfo.qtype == LDNS_RR_TYPE_PTR && qstate->qinfo.qtype == LDNS_RR_TYPE_PTR
&& qstate->qinfo.qname_len == 74 && qstate->qinfo.qname_len == 74
&& !strcmp((char*)&qstate->qinfo.qname[64], "\03ip6\04arpa")) && !strcmp((char*)&qstate->qinfo.qname[64], "\03ip6\04arpa")) {
/* Handle PTR queries for IPv6 addresses. */ /* Handle PTR queries for IPv6 addresses. */
return handle_ipv6_ptr(qstate, id); return handle_ipv6_ptr(qstate, id);
}
int synth_all_cfg = qstate->env->cfg->dns64_synthall; if(iq && iq->state == DNS64_NEW_QUERY &&
int synth_qname =
dns64_always_synth_for_qname(qstate, id) &&
!(qstate->query_flags & BIT_CD);
if (iq && iq->state == DNS64_NEW_QUERY &&
qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA && qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA &&
(synth_all_cfg || synth_qname)) { (synth_all_cfg ||
if (synth_qname) (synth_qname=(dns64_always_synth_for_qname(qstate, id)
&& !(qstate->query_flags & BIT_CD))))) {
if(synth_qname)
verbose(VERB_ALGO, "dns64: ignore-aaaa and synthesize anyway"); verbose(VERB_ALGO, "dns64: ignore-aaaa and synthesize anyway");
return generate_type_A_query(qstate, id); return generate_type_A_query(qstate, id);
} }
/* We are finished when our sub-query is finished. */ /* We are finished when our sub-query is finished. */
if (iq && iq->state == DNS64_SUBQUERY_FINISHED) if(iq && iq->state == DNS64_SUBQUERY_FINISHED)
return module_finished; return module_finished;
/* Otherwise, pass request to next module. */ /* Otherwise, pass request to next module. */
@ -636,22 +637,22 @@ handle_event_moddone(struct module_qstate* qstate, int id)
qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA && qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA &&
(!iq || iq->state != DNS64_INTERNAL_QUERY) && (!iq || iq->state != DNS64_INTERNAL_QUERY) &&
!(qstate->query_flags & BIT_CD); !(qstate->query_flags & BIT_CD);
int has_data = /*< whether query returned non-empty rrset */ int has_data = /* whether query returned non-empty rrset */
qstate->return_msg && qstate->return_msg &&
qstate->return_msg->rep && qstate->return_msg->rep &&
reply_find_answer_rrset(&qstate->qinfo, qstate->return_msg->rep); reply_find_answer_rrset(&qstate->qinfo, qstate->return_msg->rep);
int synth_qname; int synth_qname = 0;
if(want_synth && if(want_synth &&
(!has_data || (synth_qname=dns64_always_synth_for_qname(qstate, id)))) (!has_data ||
{ (synth_qname=dns64_always_synth_for_qname(qstate, id)))) {
if (synth_qname) if(synth_qname)
verbose(VERB_ALGO, "dns64: ignore-aaaa and synthesize anyway"); verbose(VERB_ALGO, "dns64: ignore-aaaa and synthesize anyway");
return generate_type_A_query(qstate, id); return generate_type_A_query(qstate, id);
} }
/* Store the response in cache. */ /* Store the response in cache. */
if ( (!iq || !iq->started_no_cache_store) && if( (!iq || !iq->started_no_cache_store) &&
qstate->return_msg && qstate->return_msg &&
qstate->return_msg->rep && qstate->return_msg->rep &&
!dns_cache_store( !dns_cache_store(