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

- Fix #1252: more indentation inconsistencies.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4125 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Ralph Dolmans 2017-04-18 09:00:52 +00:00
parent 582a7f449e
commit 89c2383c71
8 changed files with 104 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
daemon/worker.c
View file

@ -1021,22 +1021,27 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
} }
if(c->dnscrypt && !repinfo->is_dnscrypted) { if(c->dnscrypt && !repinfo->is_dnscrypted) {
char buf[LDNS_MAX_DOMAINLEN+1]; char buf[LDNS_MAX_DOMAINLEN+1];
// Check if this is unencrypted and asking for certs /* Check if this is unencrypted and asking for certs */
if(worker_check_request(c->buffer, worker) != 0) { if(worker_check_request(c->buffer, worker) != 0) {
verbose(VERB_ALGO, "dnscrypt: worker check request: bad query."); verbose(VERB_ALGO,
log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen); "dnscrypt: worker check request: bad query.");
log_addr(VERB_CLIENT,"from",&repinfo->addr,
repinfo->addrlen);
comm_point_drop_reply(repinfo); comm_point_drop_reply(repinfo);
return 0; return 0;
} }
if(!query_info_parse(&qinfo, c->buffer)) { if(!query_info_parse(&qinfo, c->buffer)) {
verbose(VERB_ALGO, "dnscrypt: worker parse request: formerror."); verbose(VERB_ALGO,
log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen); "dnscrypt: worker parse request: formerror.");
log_addr(VERB_CLIENT, "from", &repinfo->addr,
repinfo->addrlen);
comm_point_drop_reply(repinfo); comm_point_drop_reply(repinfo);
return 0; return 0;
} }
dname_str(qinfo.qname, buf); dname_str(qinfo.qname, buf);
if(!(qinfo.qtype == LDNS_RR_TYPE_TXT && if(!(qinfo.qtype == LDNS_RR_TYPE_TXT &&
strcasecmp(buf, worker->daemon->dnscenv->provider_name) == 0)) { strcasecmp(buf,
worker->daemon->dnscenv->provider_name) == 0)) {
verbose(VERB_ALGO, verbose(VERB_ALGO,
"dnscrypt: not TXT %s. Receive: %s %s", "dnscrypt: not TXT %s. Receive: %s %s",
worker->daemon->dnscenv->provider_name, worker->daemon->dnscenv->provider_name,

3
doc/Changelog
View file

@ -1,3 +1,6 @@
18 April 2017: Ralph
- Fix #1252: more indentation inconsistencies.
13 April 2017: Ralph 13 April 2017: Ralph
- Added ECS unit test (from Manu Bretelle). - Added ECS unit test (from Manu Bretelle).
- ECS documentation fix (from Manu Bretelle). - ECS documentation fix (from Manu Bretelle).

4
util/netevent.c
View file

@ -1767,8 +1767,8 @@ comm_point_create_tcp_handler(struct comm_base *base,
#endif #endif
#ifdef USE_DNSCRYPT #ifdef USE_DNSCRYPT
c->dnscrypt = 0; c->dnscrypt = 0;
// We don't know just yet if this is a dnscrypt channel. Allocation /* We don't know just yet if this is a dnscrypt channel. Allocation
// will be done when handling the callback. * will be done when handling the callback. */
c->dnscrypt_buffer = c->buffer; c->dnscrypt_buffer = c->buffer;
#endif #endif
c->repinfo.c = c; c->repinfo.c = c;