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

- Attempt to remove warning about trailing whitespace.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4568 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-03-07 08:52:18 +00:00
parent babe659a64
commit 3b25c475f5
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/worker.c
View file

@ -1339,11 +1339,11 @@ lookup_cache:
h = query_info_hash(lookup_qinfo, sldns_buffer_read_u16_at(c->buffer, 2)); h = query_info_hash(lookup_qinfo, sldns_buffer_read_u16_at(c->buffer, 2));
if((e=slabhash_lookup(worker->env.msg_cache, h, lookup_qinfo, 0))) { if((e=slabhash_lookup(worker->env.msg_cache, h, lookup_qinfo, 0))) {
/* answer from cache - we have acquired a readlock on it */ /* answer from cache - we have acquired a readlock on it */
if(answer_from_cache(worker, &qinfo, if(answer_from_cache(worker, &qinfo,
cinfo, &need_drop, &alias_rrset, &partial_rep, cinfo, &need_drop, &alias_rrset, &partial_rep,
(struct reply_info*)e->data, (struct reply_info*)e->data,
*(uint16_t*)(void *)sldns_buffer_begin(c->buffer), *(uint16_t*)(void *)sldns_buffer_begin(c->buffer),
sldns_buffer_read_u16_at(c->buffer, 2), repinfo, sldns_buffer_read_u16_at(c->buffer, 2), repinfo,
&edns)) { &edns)) {
/* prefetch it if the prefetch TTL expired. /* prefetch it if the prefetch TTL expired.
* Note that if there is more than one pass * Note that if there is more than one pass

1
doc/Changelog
View file

@ -4,6 +4,7 @@
- patch to log creates keytag queries, from A. Schulze. - patch to log creates keytag queries, from A. Schulze.
- patch suggested by Debian lintian: allow to -> allow one to, from - patch suggested by Debian lintian: allow to -> allow one to, from
A. Schulze. A. Schulze.
- Attempt to remove warning about trailing whitespace.
6 March 2018: Wouter 6 March 2018: Wouter
- Reverted fix for #3512, this may not be the best way forward; - Reverted fix for #3512, this may not be the best way forward;

4
services/cache/dns.c vendored
View file

@ -870,7 +870,7 @@ dns_cache_lookup(struct module_env* env,
return NULL; return NULL;
} }
int int
dns_cache_store(struct module_env* env, struct query_info* msgqinf, dns_cache_store(struct module_env* env, struct query_info* msgqinf,
struct reply_info* msgrep, int is_referral, time_t leeway, int pside, struct reply_info* msgrep, int is_referral, time_t leeway, int pside,
struct regional* region, uint32_t flags) struct regional* region, uint32_t flags)
@ -880,7 +880,7 @@ dns_cache_store(struct module_env* env, struct query_info* msgqinf,
rep = reply_info_copy(msgrep, env->alloc, NULL); rep = reply_info_copy(msgrep, env->alloc, NULL);
if(!rep) if(!rep)
return 0; return 0;
/* ttl must be relative ;i.e. 0..86400 not time(0)+86400. /* ttl must be relative ;i.e. 0..86400 not time(0)+86400.
* the env->now is added to message and RRsets in this routine. */ * the env->now is added to message and RRsets in this routine. */
/* the leeway is used to invalidate other rrsets earlier */ /* the leeway is used to invalidate other rrsets earlier */