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 for 2038, with time_t instead of uint32_t.

Browse source 
git-svn-id: file:///svn/unbound/trunk@2939 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2013-08-20 12:23:42 +00:00
parent 92ec7822f5
commit f1fd2b53eb
55 changed files with 233 additions and 225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
daemon/cachedump.c
View file

@ -60,7 +60,7 @@
/** convert to ldns rr */ /** convert to ldns rr */
static ldns_rr* static ldns_rr*
to_rr(struct ub_packed_rrset_key* k, struct packed_rrset_data* d, to_rr(struct ub_packed_rrset_key* k, struct packed_rrset_data* d,
uint32_t now, size_t i, uint16_t type) time_t now, size_t i, uint16_t type)
{ {
ldns_rr* rr = ldns_rr_new(); ldns_rr* rr = ldns_rr_new();
ldns_rdf* rdf; ldns_rdf* rdf;
@ -96,7 +96,7 @@ to_rr(struct ub_packed_rrset_key* k, struct packed_rrset_data* d,
/** dump one rrset zonefile line */ /** dump one rrset zonefile line */
static int static int
dump_rrset_line(SSL* ssl, struct ub_packed_rrset_key* k, dump_rrset_line(SSL* ssl, struct ub_packed_rrset_key* k,
struct packed_rrset_data* d, uint32_t now, size_t i, uint16_t type) struct packed_rrset_data* d, time_t now, size_t i, uint16_t type)
{ {
char* s; char* s;
ldns_rr* rr = to_rr(k, d, now, i, type); ldns_rr* rr = to_rr(k, d, now, i, type);
@ -119,7 +119,7 @@ dump_rrset_line(SSL* ssl, struct ub_packed_rrset_key* k,
/** dump rrset key and data info */ /** dump rrset key and data info */
static int static int
dump_rrset(SSL* ssl, struct ub_packed_rrset_key* k, dump_rrset(SSL* ssl, struct ub_packed_rrset_key* k,
struct packed_rrset_data* d, uint32_t now) struct packed_rrset_data* d, time_t now)
{ {
size_t i; size_t i;
/* rd lock held by caller */ /* rd lock held by caller */
@ -127,9 +127,9 @@ dump_rrset(SSL* ssl, struct ub_packed_rrset_key* k,
if(d->ttl < now) return 1; /* expired */ if(d->ttl < now) return 1; /* expired */
/* meta line */ /* meta line */
if(!ssl_printf(ssl, ";rrset%s %u %u %u %d %d\n", if(!ssl_printf(ssl, ";rrset%s %lld %u %u %d %d\n",
(k->rk.flags & PACKED_RRSET_NSEC_AT_APEX)?" nsec_apex":"", (k->rk.flags & PACKED_RRSET_NSEC_AT_APEX)?" nsec_apex":"",
(unsigned)(d->ttl - now), (long long)(d->ttl - now),
(unsigned)d->count, (unsigned)d->rrsig_count, (unsigned)d->count, (unsigned)d->rrsig_count,
(int)d->trust, (int)d->security (int)d->trust, (int)d->security
)) ))
@ -149,7 +149,7 @@ dump_rrset(SSL* ssl, struct ub_packed_rrset_key* k,
/** dump lruhash rrset cache */ /** dump lruhash rrset cache */
static int static int
dump_rrset_lruhash(SSL* ssl, struct lruhash* h, uint32_t now) dump_rrset_lruhash(SSL* ssl, struct lruhash* h, time_t now)
{ {
struct lruhash_entry* e; struct lruhash_entry* e;
/* lruhash already locked by caller */ /* lruhash already locked by caller */
@ -225,7 +225,7 @@ dump_msg_ref(SSL* ssl, struct ub_packed_rrset_key* k)
/** dump message entry */ /** dump message entry */
static int static int
dump_msg(SSL* ssl, struct query_info* k, struct reply_info* d, dump_msg(SSL* ssl, struct query_info* k, struct reply_info* d,
uint32_t now) time_t now)
{ {
size_t i; size_t i;
char* nm, *tp, *cl; char* nm, *tp, *cl;
@ -259,10 +259,10 @@ dump_msg(SSL* ssl, struct query_info* k, struct reply_info* d,
} }
/* meta line */ /* meta line */
if(!ssl_printf(ssl, "msg %s %s %s %d %d %u %d %u %u %u\n", if(!ssl_printf(ssl, "msg %s %s %s %d %d %lld %d %u %u %u\n",
nm, cl, tp, nm, cl, tp,
(int)d->flags, (int)d->qdcount, (int)d->flags, (int)d->qdcount,
(unsigned)(d->ttl-now), (int)d->security, (long long)(d->ttl-now), (int)d->security,
(unsigned)d->an_numrrsets, (unsigned)d->an_numrrsets,
(unsigned)d->ns_numrrsets, (unsigned)d->ns_numrrsets,
(unsigned)d->ar_numrrsets)) { (unsigned)d->ar_numrrsets)) {
@ -387,7 +387,7 @@ read_fixed(SSL* ssl, ldns_buffer* buf, const char* str)
static int static int
load_rr(SSL* ssl, ldns_buffer* buf, struct regional* region, load_rr(SSL* ssl, ldns_buffer* buf, struct regional* region,
struct ub_packed_rrset_key* rk, struct packed_rrset_data* d, struct ub_packed_rrset_key* rk, struct packed_rrset_data* d,
unsigned int i, int is_rrsig, int* go_on, uint32_t now) unsigned int i, int is_rrsig, int* go_on, time_t now)
{ {
ldns_rr* rr; ldns_rr* rr;
ldns_status status; ldns_status status;
@ -489,7 +489,7 @@ move_into_cache(struct ub_packed_rrset_key* k,
return 0; return 0;
} }
s = sizeof(*ad) + (sizeof(size_t) + sizeof(uint8_t*) + s = sizeof(*ad) + (sizeof(size_t) + sizeof(uint8_t*) +
sizeof(uint32_t))* num; sizeof(time_t))* num;
for(i=0; i<num; i++) for(i=0; i<num; i++)
s += d->rr_len[i]; s += d->rr_len[i];
ad = (struct packed_rrset_data*)malloc(s); ad = (struct packed_rrset_data*)malloc(s);
@ -505,8 +505,8 @@ move_into_cache(struct ub_packed_rrset_key* k,
p += sizeof(size_t)*num; p += sizeof(size_t)*num;
memmove(p, &d->rr_data[0], sizeof(uint8_t*)*num); memmove(p, &d->rr_data[0], sizeof(uint8_t*)*num);
p += sizeof(uint8_t*)*num; p += sizeof(uint8_t*)*num;
memmove(p, &d->rr_ttl[0], sizeof(uint32_t)*num); memmove(p, &d->rr_ttl[0], sizeof(time_t)*num);
p += sizeof(uint32_t)*num; p += sizeof(time_t)*num;
for(i=0; i<num; i++) { for(i=0; i<num; i++) {
memmove(p, d->rr_data[i], d->rr_len[i]); memmove(p, d->rr_data[i], d->rr_len[i]);
p += d->rr_len[i]; p += d->rr_len[i];
@ -530,7 +530,8 @@ load_rrset(SSL* ssl, ldns_buffer* buf, struct worker* worker)
struct regional* region = worker->scratchpad; struct regional* region = worker->scratchpad;
struct ub_packed_rrset_key* rk; struct ub_packed_rrset_key* rk;
struct packed_rrset_data* d; struct packed_rrset_data* d;
unsigned int ttl, rr_count, rrsig_count, trust, security; unsigned int rr_count, rrsig_count, trust, security;
long long ttl;
unsigned int i; unsigned int i;
int go_on = 1; int go_on = 1;
regional_free_all(region); regional_free_all(region);
@ -552,7 +553,7 @@ load_rrset(SSL* ssl, ldns_buffer* buf, struct worker* worker)
s += 10; s += 10;
rk->rk.flags |= PACKED_RRSET_NSEC_AT_APEX; rk->rk.flags |= PACKED_RRSET_NSEC_AT_APEX;
} }
if(sscanf(s, " %u %u %u %u %u", &ttl, &rr_count, &rrsig_count, if(sscanf(s, " %lld %u %u %u %u", &ttl, &rr_count, &rrsig_count,
&trust, &security) != 5) { &trust, &security) != 5) {
log_warn("error bad rrset spec %s", s); log_warn("error bad rrset spec %s", s);
return 0; return 0;
@ -565,12 +566,12 @@ load_rrset(SSL* ssl, ldns_buffer* buf, struct worker* worker)
d->rrsig_count = (size_t)rrsig_count; d->rrsig_count = (size_t)rrsig_count;
d->security = (enum sec_status)security; d->security = (enum sec_status)security;
d->trust = (enum rrset_trust)trust; d->trust = (enum rrset_trust)trust;
d->ttl = (uint32_t)ttl + *worker->env.now; d->ttl = (time_t)ttl + *worker->env.now;
d->rr_len = regional_alloc_zero(region, d->rr_len = regional_alloc_zero(region,
sizeof(size_t)*(d->count+d->rrsig_count)); sizeof(size_t)*(d->count+d->rrsig_count));
d->rr_ttl = regional_alloc_zero(region, d->rr_ttl = regional_alloc_zero(region,
sizeof(uint32_t)*(d->count+d->rrsig_count)); sizeof(time_t)*(d->count+d->rrsig_count));
d->rr_data = regional_alloc_zero(region, d->rr_data = regional_alloc_zero(region,
sizeof(uint8_t*)*(d->count+d->rrsig_count)); sizeof(uint8_t*)*(d->count+d->rrsig_count));
if(!d->rr_len || !d->rr_ttl || !d->rr_data) { if(!d->rr_len || !d->rr_ttl || !d->rr_data) {
@ -718,7 +719,8 @@ load_msg(SSL* ssl, ldns_buffer* buf, struct worker* worker)
struct query_info qinf; struct query_info qinf;
struct reply_info rep; struct reply_info rep;
char* s = (char*)ldns_buffer_begin(buf); char* s = (char*)ldns_buffer_begin(buf);
unsigned int flags, qdcount, ttl, security, an, ns, ar; unsigned int flags, qdcount, security, an, ns, ar;
long long ttl;
size_t i; size_t i;
int go_on = 1; int go_on = 1;
@ -735,14 +737,14 @@ load_msg(SSL* ssl, ldns_buffer* buf, struct worker* worker)
} }
/* read remainder of line */ /* read remainder of line */
if(sscanf(s, " %u %u %u %u %u %u %u", &flags, &qdcount, &ttl, if(sscanf(s, " %u %u %lld %u %u %u %u", &flags, &qdcount, &ttl,
&security, &an, &ns, &ar) != 7) { &security, &an, &ns, &ar) != 7) {
log_warn("error cannot parse numbers: %s", s); log_warn("error cannot parse numbers: %s", s);
return 0; return 0;
} }
rep.flags = (uint16_t)flags; rep.flags = (uint16_t)flags;
rep.qdcount = (uint16_t)qdcount; rep.qdcount = (uint16_t)qdcount;
rep.ttl = (uint32_t)ttl; rep.ttl = (time_t)ttl;
rep.prefetch_ttl = PREFETCH_TTL_CALC(rep.ttl); rep.prefetch_ttl = PREFETCH_TTL_CALC(rep.ttl);
rep.security = (enum sec_status)security; rep.security = (enum sec_status)security;
rep.an_numrrsets = (size_t)an; rep.an_numrrsets = (size_t)an;
@ -800,8 +802,9 @@ print_dp_details(SSL* ssl, struct worker* worker, struct delegpt* dp)
{ {
char buf[257]; char buf[257];
struct delegpt_addr* a; struct delegpt_addr* a;
int lame, dlame, rlame, rto, edns_vs, to, delay, entry_ttl, int lame, dlame, rlame, rto, edns_vs, to, delay,
tA = 0, tAAAA = 0, tother = 0; tA = 0, tAAAA = 0, tother = 0;
long long entry_ttl;
struct rtt_info ri; struct rtt_info ri;
uint8_t edns_lame_known; uint8_t edns_lame_known;
for(a = dp->target_list; a; a = a->next_target) { for(a = dp->target_list; a; a = a->next_target) {
@ -840,7 +843,7 @@ print_dp_details(SSL* ssl, struct worker* worker, struct delegpt* dp)
return; return;
continue; /* skip stuff not in infra cache */ continue; /* skip stuff not in infra cache */
} }
if(!ssl_printf(ssl, "%s%s%s%srto %d msec, ttl %d, ping %d " if(!ssl_printf(ssl, "%s%s%s%srto %d msec, ttl %lld, ping %d "
"var %d rtt %d, tA %d, tAAAA %d, tother %d", "var %d rtt %d, tA %d, tAAAA %d, tother %d",
lame?"LAME ":"", dlame?"NoDNSSEC ":"", lame?"LAME ":"", dlame?"NoDNSSEC ":"",
a->lame?"AddrWasParentSide ":"", a->lame?"AddrWasParentSide ":"",

6
daemon/remote.c
View file

@ -1118,9 +1118,9 @@ struct del_info {
/** labels */ /** labels */
int labs; int labs;
/** now */ /** now */
uint32_t now; time_t now;
/** time to invalidate to */ /** time to invalidate to */
uint32_t expired; time_t expired;
/** number of rrsets removed */ /** number of rrsets removed */
size_t num_rrsets; size_t num_rrsets;
/** number of msgs removed */ /** number of msgs removed */
@ -1836,7 +1836,7 @@ struct infra_arg {
/** the SSL connection */ /** the SSL connection */
SSL* ssl; SSL* ssl;
/** the time now */ /** the time now */
uint32_t now; time_t now;
}; };
/** callback for every host element in the infra cache */ /** callback for every host element in the infra cache */

8
daemon/worker.c
View file

@ -449,7 +449,7 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
*/ */
uint16_t udpsize = edns->udp_size; uint16_t udpsize = edns->udp_size;
int secure = 0; int secure = 0;
uint32_t timenow = *worker->env.now; time_t timenow = *worker->env.now;
int must_validate = (!(flags&BIT_CD) || worker->env.cfg->ignore_cd) int must_validate = (!(flags&BIT_CD) || worker->env.cfg->ignore_cd)
&& worker->env.need_to_validate; && worker->env.need_to_validate;
struct dns_msg *msg = NULL; struct dns_msg *msg = NULL;
@ -524,7 +524,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
struct reply_info* rep, uint16_t id, uint16_t flags, struct reply_info* rep, uint16_t id, uint16_t flags,
struct comm_reply* repinfo, struct edns_data* edns) struct comm_reply* repinfo, struct edns_data* edns)
{ {
uint32_t timenow = *worker->env.now; time_t timenow = *worker->env.now;
uint16_t udpsize = edns->udp_size; uint16_t udpsize = edns->udp_size;
int secure; int secure;
int must_validate = (!(flags&BIT_CD) || worker->env.cfg->ignore_cd) int must_validate = (!(flags&BIT_CD) || worker->env.cfg->ignore_cd)
@ -614,7 +614,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
/** Reply to client and perform prefetch to keep cache up to date */ /** Reply to client and perform prefetch to keep cache up to date */
static void static void
reply_and_prefetch(struct worker* worker, struct query_info* qinfo, reply_and_prefetch(struct worker* worker, struct query_info* qinfo,
uint16_t flags, struct comm_reply* repinfo, uint32_t leeway) uint16_t flags, struct comm_reply* repinfo, time_t leeway)
{ {
/* first send answer to client to keep its latency /* first send answer to client to keep its latency
* as small as a cachereply */ * as small as a cachereply */
@ -896,7 +896,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
/* prefetch it if the prefetch TTL expired */ /* prefetch it if the prefetch TTL expired */
if(worker->env.cfg->prefetch && *worker->env.now >= if(worker->env.cfg->prefetch && *worker->env.now >=
((struct reply_info*)e->data)->prefetch_ttl) { ((struct reply_info*)e->data)->prefetch_ttl) {
uint32_t leeway = ((struct reply_info*)e-> time_t leeway = ((struct reply_info*)e->
data)->ttl - *worker->env.now; data)->ttl - *worker->env.now;
lock_rw_unlock(&e->lock); lock_rw_unlock(&e->lock);
reply_and_prefetch(worker, &qinfo, reply_and_prefetch(worker, &qinfo,

3
doc/Changelog
View file

@ -1,3 +1,6 @@
20 Aug 2013: Wouter
- Fix for 2038, with time_t instead of uint32_t.
19 Aug 2013: Wouter 19 Aug 2013: Wouter
- Fix#519 ub_ctx_delete may hang in some scenarios (libunbound). - Fix#519 ub_ctx_delete may hang in some scenarios (libunbound).

2
iterator/iter_scrub.c
View file

@ -520,7 +520,7 @@ store_rrset(ldns_buffer* pkt, struct msg_parse* msg, struct module_env* env,
struct ub_packed_rrset_key* k; struct ub_packed_rrset_key* k;
struct packed_rrset_data* d; struct packed_rrset_data* d;
struct rrset_ref ref; struct rrset_ref ref;
uint32_t now = *env->now; time_t now = *env->now;
k = alloc_special_obtain(env->alloc); k = alloc_special_obtain(env->alloc);
if(!k) if(!k)

12
iterator/iter_utils.c
View file

@ -177,7 +177,7 @@ iter_apply_cfg(struct iter_env* iter_env, struct config_file* cfg)
*/ */
static int static int
iter_filter_unsuitable(struct iter_env* iter_env, struct module_env* env, iter_filter_unsuitable(struct iter_env* iter_env, struct module_env* env,
uint8_t* name, size_t namelen, uint16_t qtype, uint32_t now, uint8_t* name, size_t namelen, uint16_t qtype, time_t now,
struct delegpt_addr* a) struct delegpt_addr* a)
{ {
int rtt, lame, reclame, dnsseclame; int rtt, lame, reclame, dnsseclame;
@ -234,7 +234,7 @@ iter_filter_unsuitable(struct iter_env* iter_env, struct module_env* env,
/** lookup RTT information, and also store fastest rtt (if any) */ /** lookup RTT information, and also store fastest rtt (if any) */
static int static int
iter_fill_rtt(struct iter_env* iter_env, struct module_env* env, iter_fill_rtt(struct iter_env* iter_env, struct module_env* env,
uint8_t* name, size_t namelen, uint16_t qtype, uint32_t now, uint8_t* name, size_t namelen, uint16_t qtype, time_t now,
struct delegpt* dp, int* best_rtt, struct sock_list* blacklist) struct delegpt* dp, int* best_rtt, struct sock_list* blacklist)
{ {
int got_it = 0; int got_it = 0;
@ -263,7 +263,7 @@ iter_fill_rtt(struct iter_env* iter_env, struct module_env* env,
* returns number of best targets (or 0, no suitable targets) */ * returns number of best targets (or 0, no suitable targets) */
static int static int
iter_filter_order(struct iter_env* iter_env, struct module_env* env, iter_filter_order(struct iter_env* iter_env, struct module_env* env,
uint8_t* name, size_t namelen, uint16_t qtype, uint32_t now, uint8_t* name, size_t namelen, uint16_t qtype, time_t now,
struct delegpt* dp, int* selected_rtt, int open_target, struct delegpt* dp, int* selected_rtt, int open_target,
struct sock_list* blacklist) struct sock_list* blacklist)
{ {
@ -422,7 +422,7 @@ dns_copy_msg(struct dns_msg* from, struct regional* region)
void void
iter_dns_store(struct module_env* env, struct query_info* msgqinf, iter_dns_store(struct module_env* env, struct query_info* msgqinf,
struct reply_info* msgrep, int is_referral, uint32_t leeway, int pside, struct reply_info* msgrep, int is_referral, time_t leeway, int pside,
struct regional* region) struct regional* region)
{ {
if(!dns_cache_store(env, msgqinf, msgrep, is_referral, leeway, if(!dns_cache_store(env, msgqinf, msgrep, is_referral, leeway,
@ -770,7 +770,7 @@ void iter_store_parentside_neg(struct module_env* env,
/* TTL: NS from referral in iq->deleg_msg, /* TTL: NS from referral in iq->deleg_msg,
* or first RR from iq->response, * or first RR from iq->response,
* or servfail5secs if !iq->response */ * or servfail5secs if !iq->response */
uint32_t ttl = NORR_TTL; time_t ttl = NORR_TTL;
struct ub_packed_rrset_key* neg; struct ub_packed_rrset_key* neg;
struct packed_rrset_data* newd; struct packed_rrset_data* newd;
if(rep) { if(rep) {
@ -800,7 +800,7 @@ void iter_store_parentside_neg(struct module_env* env,
neg->entry.hash = rrset_key_hash(&neg->rk); neg->entry.hash = rrset_key_hash(&neg->rk);
newd = (struct packed_rrset_data*)regional_alloc_zero(env->scratch, newd = (struct packed_rrset_data*)regional_alloc_zero(env->scratch,
sizeof(struct packed_rrset_data) + sizeof(size_t) + sizeof(struct packed_rrset_data) + sizeof(size_t) +
sizeof(uint8_t*) + sizeof(uint32_t) + sizeof(uint16_t)); sizeof(uint8_t*) + sizeof(time_t) + sizeof(uint16_t));
if(!newd) { if(!newd) {
log_err("out of memory in store_parentside_neg"); log_err("out of memory in store_parentside_neg");
return; return;

2
iterator/iter_utils.h
View file

@ -131,7 +131,7 @@ struct dns_msg* dns_copy_msg(struct dns_msg* from, struct regional* regional);
* but the query resolution can continue without cache storage. * but the query resolution can continue without cache storage.
*/ */
void iter_dns_store(struct module_env* env, struct query_info* qinf, void iter_dns_store(struct module_env* env, struct query_info* qinf,
struct reply_info* rep, int is_referral, uint32_t leeway, int pside, struct reply_info* rep, int is_referral, time_t leeway, int pside,
struct regional* region); struct regional* region);
/** /**

36
services/cache/dns.c vendored
View file

@ -66,8 +66,8 @@
* @param region: for qrep allocs. * @param region: for qrep allocs.
*/ */
static void static void
store_rrsets(struct module_env* env, struct reply_info* rep, uint32_t now, store_rrsets(struct module_env* env, struct reply_info* rep, time_t now,
uint32_t leeway, int pside, struct reply_info* qrep, time_t leeway, int pside, struct reply_info* qrep,
struct regional* region) struct regional* region)
{ {
size_t i; size_t i;
@ -105,11 +105,11 @@ store_rrsets(struct module_env* env, struct reply_info* rep, uint32_t now,
void void
dns_cache_store_msg(struct module_env* env, struct query_info* qinfo, dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
hashvalue_t hash, struct reply_info* rep, uint32_t leeway, int pside, hashvalue_t hash, struct reply_info* rep, time_t leeway, int pside,
struct reply_info* qrep, struct regional* region) struct reply_info* qrep, struct regional* region)
{ {
struct msgreply_entry* e; struct msgreply_entry* e;
uint32_t ttl = rep->ttl; time_t ttl = rep->ttl;
size_t i; size_t i;
/* store RRsets */ /* store RRsets */
@ -142,7 +142,7 @@ dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
/** find closest NS or DNAME and returns the rrset (locked) */ /** find closest NS or DNAME and returns the rrset (locked) */
static struct ub_packed_rrset_key* static struct ub_packed_rrset_key*
find_closest_of_type(struct module_env* env, uint8_t* qname, size_t qnamelen, find_closest_of_type(struct module_env* env, uint8_t* qname, size_t qnamelen,
uint16_t qclass, uint32_t now, uint16_t searchtype, int stripfront) uint16_t qclass, time_t now, uint16_t searchtype, int stripfront)
{ {
struct ub_packed_rrset_key *rrset; struct ub_packed_rrset_key *rrset;
uint8_t lablen; uint8_t lablen;
@ -171,7 +171,7 @@ find_closest_of_type(struct module_env* env, uint8_t* qname, size_t qnamelen,
/** add addr to additional section */ /** add addr to additional section */
static void static void
addr_to_additional(struct ub_packed_rrset_key* rrset, struct regional* region, addr_to_additional(struct ub_packed_rrset_key* rrset, struct regional* region,
struct dns_msg* msg, uint32_t now) struct dns_msg* msg, time_t now)
{ {
if((msg->rep->rrsets[msg->rep->rrset_count] = if((msg->rep->rrsets[msg->rep->rrset_count] =
packed_rrset_copy_region(rrset, region, now))) { packed_rrset_copy_region(rrset, region, now))) {
@ -183,7 +183,7 @@ addr_to_additional(struct ub_packed_rrset_key* rrset, struct regional* region,
/** lookup message in message cache */ /** lookup message in message cache */
static struct msgreply_entry* static struct msgreply_entry*
msg_cache_lookup(struct module_env* env, uint8_t* qname, size_t qnamelen, msg_cache_lookup(struct module_env* env, uint8_t* qname, size_t qnamelen,
uint16_t qtype, uint16_t qclass, uint32_t now, int wr) uint16_t qtype, uint16_t qclass, time_t now, int wr)
{ {
struct lruhash_entry* e; struct lruhash_entry* e;
struct query_info k; struct query_info k;
@ -207,7 +207,7 @@ msg_cache_lookup(struct module_env* env, uint8_t* qname, size_t qnamelen,
/** find and add A and AAAA records for nameservers in delegpt */ /** find and add A and AAAA records for nameservers in delegpt */
static int static int
find_add_addrs(struct module_env* env, uint16_t qclass, find_add_addrs(struct module_env* env, uint16_t qclass,
struct regional* region, struct delegpt* dp, uint32_t now, struct regional* region, struct delegpt* dp, time_t now,
struct dns_msg** msg) struct dns_msg** msg)
{ {
struct delegpt_ns* ns; struct delegpt_ns* ns;
@ -262,7 +262,7 @@ cache_fill_missing(struct module_env* env, uint16_t qclass,
struct delegpt_ns* ns; struct delegpt_ns* ns;
struct msgreply_entry* neg; struct msgreply_entry* neg;
struct ub_packed_rrset_key* akey; struct ub_packed_rrset_key* akey;
uint32_t now = *env->now; time_t now = *env->now;
for(ns = dp->nslist; ns; ns = ns->next) { for(ns = dp->nslist; ns; ns = ns->next) {
akey = rrset_cache_lookup(env->rrset_cache, ns->name, akey = rrset_cache_lookup(env->rrset_cache, ns->name,
ns->namelen, LDNS_RR_TYPE_A, qclass, 0, now, 0); ns->namelen, LDNS_RR_TYPE_A, qclass, 0, now, 0);
@ -307,7 +307,7 @@ cache_fill_missing(struct module_env* env, uint16_t qclass,
/** find and add DS or NSEC to delegation msg */ /** find and add DS or NSEC to delegation msg */
static void static void
find_add_ds(struct module_env* env, struct regional* region, find_add_ds(struct module_env* env, struct regional* region,
struct dns_msg* msg, struct delegpt* dp, uint32_t now) struct dns_msg* msg, struct delegpt* dp, time_t now)
{ {
/* Lookup the DS or NSEC at the delegation point. */ /* Lookup the DS or NSEC at the delegation point. */
struct ub_packed_rrset_key* rrset = rrset_cache_lookup( struct ub_packed_rrset_key* rrset = rrset_cache_lookup(
@ -369,7 +369,7 @@ dns_msg_create(uint8_t* qname, size_t qnamelen, uint16_t qtype,
int int
dns_msg_authadd(struct dns_msg* msg, struct regional* region, dns_msg_authadd(struct dns_msg* msg, struct regional* region,
struct ub_packed_rrset_key* rrset, uint32_t now) struct ub_packed_rrset_key* rrset, time_t now)
{ {
if(!(msg->rep->rrsets[msg->rep->rrset_count++] = if(!(msg->rep->rrsets[msg->rep->rrset_count++] =
packed_rrset_copy_region(rrset, region, now))) packed_rrset_copy_region(rrset, region, now)))
@ -381,7 +381,7 @@ dns_msg_authadd(struct dns_msg* msg, struct regional* region,
struct delegpt* struct delegpt*
dns_cache_find_delegation(struct module_env* env, uint8_t* qname, dns_cache_find_delegation(struct module_env* env, uint8_t* qname,
size_t qnamelen, uint16_t qtype, uint16_t qclass, size_t qnamelen, uint16_t qtype, uint16_t qclass,
struct regional* region, struct dns_msg** msg, uint32_t now) struct regional* region, struct dns_msg** msg, time_t now)
{ {
/* try to find closest NS rrset */ /* try to find closest NS rrset */
struct ub_packed_rrset_key* nskey; struct ub_packed_rrset_key* nskey;
@ -455,7 +455,7 @@ gen_dns_msg(struct regional* region, struct query_info* q, size_t num)
/** generate dns_msg from cached message */ /** generate dns_msg from cached message */
static struct dns_msg* static struct dns_msg*
tomsg(struct module_env* env, struct query_info* q, struct reply_info* r, tomsg(struct module_env* env, struct query_info* q, struct reply_info* r,
struct regional* region, uint32_t now, struct regional* scratch) struct regional* region, time_t now, struct regional* scratch)
{ {
struct dns_msg* msg; struct dns_msg* msg;
size_t i; size_t i;
@ -506,7 +506,7 @@ tomsg(struct module_env* env, struct query_info* q, struct reply_info* r,
/** synthesize RRset-only response from cached RRset item */ /** synthesize RRset-only response from cached RRset item */
static struct dns_msg* static struct dns_msg*
rrset_msg(struct ub_packed_rrset_key* rrset, struct regional* region, rrset_msg(struct ub_packed_rrset_key* rrset, struct regional* region,
uint32_t now, struct query_info* q) time_t now, struct query_info* q)
{ {
struct dns_msg* msg; struct dns_msg* msg;
struct packed_rrset_data* d = (struct packed_rrset_data*) struct packed_rrset_data* d = (struct packed_rrset_data*)
@ -535,7 +535,7 @@ rrset_msg(struct ub_packed_rrset_key* rrset, struct regional* region,
/** synthesize DNAME+CNAME response from cached DNAME item */ /** synthesize DNAME+CNAME response from cached DNAME item */
static struct dns_msg* static struct dns_msg*
synth_dname_msg(struct ub_packed_rrset_key* rrset, struct regional* region, synth_dname_msg(struct ub_packed_rrset_key* rrset, struct regional* region,
uint32_t now, struct query_info* q) time_t now, struct query_info* q)
{ {
struct dns_msg* msg; struct dns_msg* msg;
struct ub_packed_rrset_key* ck; struct ub_packed_rrset_key* ck;
@ -599,7 +599,7 @@ synth_dname_msg(struct ub_packed_rrset_key* rrset, struct regional* region,
ck->entry.hash = rrset_key_hash(&ck->rk); ck->entry.hash = rrset_key_hash(&ck->rk);
newd = (struct packed_rrset_data*)regional_alloc_zero(region, newd = (struct packed_rrset_data*)regional_alloc_zero(region,
sizeof(struct packed_rrset_data) + sizeof(size_t) + sizeof(struct packed_rrset_data) + sizeof(size_t) +
sizeof(uint8_t*) + sizeof(uint32_t) + sizeof(uint16_t) sizeof(uint8_t*) + sizeof(time_t) + sizeof(uint16_t)
+ newlen); + newlen);
if(!newd) if(!newd)
return NULL; return NULL;
@ -630,7 +630,7 @@ dns_cache_lookup(struct module_env* env,
struct lruhash_entry* e; struct lruhash_entry* e;
struct query_info k; struct query_info k;
hashvalue_t h; hashvalue_t h;
uint32_t now = *env->now; time_t now = *env->now;
struct ub_packed_rrset_key* rrset; struct ub_packed_rrset_key* rrset;
/* lookup first, this has both NXdomains and ANSWER responses */ /* lookup first, this has both NXdomains and ANSWER responses */
@ -739,7 +739,7 @@ dns_cache_lookup(struct module_env* env,
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, uint32_t leeway, int pside, struct reply_info* msgrep, int is_referral, time_t leeway, int pside,
struct regional* region) struct regional* region)
{ {
struct reply_info* rep = NULL; struct reply_info* rep = NULL;

8
services/cache/dns.h vendored
View file

@ -82,7 +82,7 @@ struct dns_msg {
* @return 0 on alloc error (out of memory). * @return 0 on alloc error (out of memory).
*/ */
int dns_cache_store(struct module_env* env, struct query_info* qinf, int dns_cache_store(struct module_env* env, struct query_info* qinf,
struct reply_info* rep, int is_referral, uint32_t leeway, int pside, struct reply_info* rep, int is_referral, time_t leeway, int pside,
struct regional* region); struct regional* region);
/** /**
@ -105,7 +105,7 @@ int dns_cache_store(struct module_env* env, struct query_info* qinf,
* @param region: to allocate into for qmsg. * @param region: to allocate into for qmsg.
*/ */
void dns_cache_store_msg(struct module_env* env, struct query_info* qinfo, void dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
hashvalue_t hash, struct reply_info* rep, uint32_t leeway, int pside, hashvalue_t hash, struct reply_info* rep, time_t leeway, int pside,
struct reply_info* qrep, struct regional* region); struct reply_info* qrep, struct regional* region);
/** /**
@ -123,7 +123,7 @@ void dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
*/ */
struct delegpt* dns_cache_find_delegation(struct module_env* env, struct delegpt* dns_cache_find_delegation(struct module_env* env,
uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass, uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass,
struct regional* region, struct dns_msg** msg, uint32_t timenow); struct regional* region, struct dns_msg** msg, time_t timenow);
/** /**
* Find cached message * Find cached message
@ -177,6 +177,6 @@ struct dns_msg* dns_msg_create(uint8_t* qname, size_t qnamelen, uint16_t qtype,
* @return true if worked, false on fail * @return true if worked, false on fail
*/ */
int dns_msg_authadd(struct dns_msg* msg, struct regional* region, int dns_msg_authadd(struct dns_msg* msg, struct regional* region,
struct ub_packed_rrset_key* rrset, uint32_t now); struct ub_packed_rrset_key* rrset, time_t now);
#endif /* SERVICES_CACHE_DNS_H */ #endif /* SERVICES_CACHE_DNS_H */

22
services/cache/infra.c vendored
View file

@ -189,7 +189,7 @@ infra_lookup_nottl(struct infra_cache* infra, struct sockaddr_storage* addr,
/** init the data elements */ /** init the data elements */
static void static void
data_entry_init(struct infra_cache* infra, struct lruhash_entry* e, data_entry_init(struct infra_cache* infra, struct lruhash_entry* e,
uint32_t timenow) time_t timenow)
{ {
struct infra_data* data = (struct infra_data*)e->data; struct infra_data* data = (struct infra_data*)e->data;
data->ttl = timenow + infra->host_ttl; data->ttl = timenow + infra->host_ttl;
@ -218,7 +218,7 @@ data_entry_init(struct infra_cache* infra, struct lruhash_entry* e,
*/ */
static struct lruhash_entry* static struct lruhash_entry*
new_entry(struct infra_cache* infra, struct sockaddr_storage* addr, new_entry(struct infra_cache* infra, struct sockaddr_storage* addr,
socklen_t addrlen, uint8_t* name, size_t namelen, uint32_t tm) socklen_t addrlen, uint8_t* name, size_t namelen, time_t tm)
{ {
struct infra_data* data; struct infra_data* data;
struct infra_key* key = (struct infra_key*)malloc(sizeof(*key)); struct infra_key* key = (struct infra_key*)malloc(sizeof(*key));
@ -248,7 +248,7 @@ new_entry(struct infra_cache* infra, struct sockaddr_storage* addr,
int int
infra_host(struct infra_cache* infra, struct sockaddr_storage* addr, infra_host(struct infra_cache* infra, struct sockaddr_storage* addr,
socklen_t addrlen, uint8_t* nm, size_t nmlen, uint32_t timenow, socklen_t addrlen, uint8_t* nm, size_t nmlen, time_t timenow,
int* edns_vs, uint8_t* edns_lame_known, int* to) int* edns_vs, uint8_t* edns_lame_known, int* to)
{ {
struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen, struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen,
@ -317,7 +317,7 @@ infra_host(struct infra_cache* infra, struct sockaddr_storage* addr,
int int
infra_set_lame(struct infra_cache* infra, struct sockaddr_storage* addr, infra_set_lame(struct infra_cache* infra, struct sockaddr_storage* addr,
socklen_t addrlen, uint8_t* nm, size_t nmlen, uint32_t timenow, socklen_t addrlen, uint8_t* nm, size_t nmlen, time_t timenow,
int dnsseclame, int reclame, uint16_t qtype) int dnsseclame, int reclame, uint16_t qtype)
{ {
struct infra_data* data; struct infra_data* data;
@ -374,7 +374,7 @@ infra_update_tcp_works(struct infra_cache* infra,
int int
infra_rtt_update(struct infra_cache* infra, struct sockaddr_storage* addr, infra_rtt_update(struct infra_cache* infra, struct sockaddr_storage* addr,
socklen_t addrlen, uint8_t* nm, size_t nmlen, int qtype, socklen_t addrlen, uint8_t* nm, size_t nmlen, int qtype,
int roundtrip, int orig_rtt, uint32_t timenow) int roundtrip, int orig_rtt, time_t timenow)
{ {
struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen, struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen,
nm, nmlen, 1); nm, nmlen, 1);
@ -425,19 +425,19 @@ infra_rtt_update(struct infra_cache* infra, struct sockaddr_storage* addr,
return rto; return rto;
} }
int infra_get_host_rto(struct infra_cache* infra, long long infra_get_host_rto(struct infra_cache* infra,
struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* nm, struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* nm,
size_t nmlen, struct rtt_info* rtt, int* delay, uint32_t timenow, size_t nmlen, struct rtt_info* rtt, int* delay, time_t timenow,
int* tA, int* tAAAA, int* tother) int* tA, int* tAAAA, int* tother)
{ {
struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen, struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen,
nm, nmlen, 0); nm, nmlen, 0);
struct infra_data* data; struct infra_data* data;
int ttl = -2; long long ttl = -2;
if(!e) return -1; if(!e) return -1;
data = (struct infra_data*)e->data; data = (struct infra_data*)e->data;
if(data->ttl >= timenow) { if(data->ttl >= timenow) {
ttl = (int)(data->ttl - timenow); ttl = (long long)(data->ttl - timenow);
memmove(rtt, &data->rtt, sizeof(*rtt)); memmove(rtt, &data->rtt, sizeof(*rtt));
if(timenow < data->probedelay) if(timenow < data->probedelay)
*delay = (int)(data->probedelay - timenow); *delay = (int)(data->probedelay - timenow);
@ -453,7 +453,7 @@ int infra_get_host_rto(struct infra_cache* infra,
int int
infra_edns_update(struct infra_cache* infra, struct sockaddr_storage* addr, infra_edns_update(struct infra_cache* infra, struct sockaddr_storage* addr,
socklen_t addrlen, uint8_t* nm, size_t nmlen, int edns_version, socklen_t addrlen, uint8_t* nm, size_t nmlen, int edns_version,
uint32_t timenow) time_t timenow)
{ {
struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen, struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen,
nm, nmlen, 1); nm, nmlen, 1);
@ -485,7 +485,7 @@ int
infra_get_lame_rtt(struct infra_cache* infra, infra_get_lame_rtt(struct infra_cache* infra,
struct sockaddr_storage* addr, socklen_t addrlen, struct sockaddr_storage* addr, socklen_t addrlen,
uint8_t* name, size_t namelen, uint16_t qtype, uint8_t* name, size_t namelen, uint16_t qtype,
int* lame, int* dnsseclame, int* reclame, int* rtt, uint32_t timenow) int* lame, int* dnsseclame, int* reclame, int* rtt, time_t timenow)
{ {
struct infra_data* host; struct infra_data* host;
struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen, struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen,

18
services/cache/infra.h vendored
View file

@ -68,10 +68,10 @@ struct infra_key {
*/ */
struct infra_data { struct infra_data {
/** TTL value for this entry. absolute time. */ /** TTL value for this entry. absolute time. */
uint32_t ttl; time_t ttl;
/** time in seconds (absolute) when probing re-commences, 0 disabled */ /** time in seconds (absolute) when probing re-commences, 0 disabled */
uint32_t probedelay; time_t probedelay;
/** round trip times for timeout calculation */ /** round trip times for timeout calculation */
struct rtt_info rtt; struct rtt_info rtt;
@ -173,7 +173,7 @@ struct lruhash_entry* infra_lookup_nottl(struct infra_cache* infra,
*/ */
int infra_host(struct infra_cache* infra, struct sockaddr_storage* addr, int infra_host(struct infra_cache* infra, struct sockaddr_storage* addr,
socklen_t addrlen, uint8_t* name, size_t namelen, socklen_t addrlen, uint8_t* name, size_t namelen,
uint32_t timenow, int* edns_vs, uint8_t* edns_lame_known, int* to); time_t timenow, int* edns_vs, uint8_t* edns_lame_known, int* to);
/** /**
* Set a host to be lame for the given zone. * Set a host to be lame for the given zone.
@ -192,7 +192,7 @@ int infra_host(struct infra_cache* infra, struct sockaddr_storage* addr,
*/ */
int infra_set_lame(struct infra_cache* infra, int infra_set_lame(struct infra_cache* infra,
struct sockaddr_storage* addr, socklen_t addrlen, struct sockaddr_storage* addr, socklen_t addrlen,
uint8_t* name, size_t namelen, uint32_t timenow, int dnsseclame, uint8_t* name, size_t namelen, time_t timenow, int dnsseclame,
int reclame, uint16_t qtype); int reclame, uint16_t qtype);
/** /**
@ -212,7 +212,7 @@ int infra_set_lame(struct infra_cache* infra,
*/ */
int infra_rtt_update(struct infra_cache* infra, struct sockaddr_storage* addr, int infra_rtt_update(struct infra_cache* infra, struct sockaddr_storage* addr,
socklen_t addrlen, uint8_t* name, size_t namelen, int qtype, socklen_t addrlen, uint8_t* name, size_t namelen, int qtype,
int roundtrip, int orig_rtt, uint32_t timenow); int roundtrip, int orig_rtt, time_t timenow);
/** /**
* Update information for the host, store that a TCP transaction works. * Update information for the host, store that a TCP transaction works.
@ -240,7 +240,7 @@ void infra_update_tcp_works(struct infra_cache* infra,
*/ */
int infra_edns_update(struct infra_cache* infra, int infra_edns_update(struct infra_cache* infra,
struct sockaddr_storage* addr, socklen_t addrlen, struct sockaddr_storage* addr, socklen_t addrlen,
uint8_t* name, size_t namelen, int edns_version, uint32_t timenow); uint8_t* name, size_t namelen, int edns_version, time_t timenow);
/** /**
* Get Lameness information and average RTT if host is in the cache. * Get Lameness information and average RTT if host is in the cache.
@ -263,7 +263,7 @@ int infra_edns_update(struct infra_cache* infra,
int infra_get_lame_rtt(struct infra_cache* infra, int infra_get_lame_rtt(struct infra_cache* infra,
struct sockaddr_storage* addr, socklen_t addrlen, struct sockaddr_storage* addr, socklen_t addrlen,
uint8_t* name, size_t namelen, uint16_t qtype, uint8_t* name, size_t namelen, uint16_t qtype,
int* lame, int* dnsseclame, int* reclame, int* rtt, uint32_t timenow); int* lame, int* dnsseclame, int* reclame, int* rtt, time_t timenow);
/** /**
* Get additional (debug) info on timing. * Get additional (debug) info on timing.
@ -281,9 +281,9 @@ int infra_get_lame_rtt(struct infra_cache* infra,
* @return TTL the infra host element is valid for. If -1: not found in cache. * @return TTL the infra host element is valid for. If -1: not found in cache.
* TTL -2: found but expired. * TTL -2: found but expired.
*/ */
int infra_get_host_rto(struct infra_cache* infra, long long infra_get_host_rto(struct infra_cache* infra,
struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* name, struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* name,
size_t namelen, struct rtt_info* rtt, int* delay, uint32_t timenow, size_t namelen, struct rtt_info* rtt, int* delay, time_t timenow,
int* tA, int* tAAAA, int* tother); int* tA, int* tAAAA, int* tother);
/** /**

12
services/cache/rrset.c vendored
View file

@ -120,7 +120,7 @@ rrset_cache_touch(struct rrset_cache* r, struct ub_packed_rrset_key* key,
/** see if rrset needs to be updated in the cache */ /** see if rrset needs to be updated in the cache */
static int static int
need_to_update_rrset(void* nd, void* cd, uint32_t timenow, int equal, int ns) need_to_update_rrset(void* nd, void* cd, time_t timenow, int equal, int ns)
{ {
struct packed_rrset_data* newd = (struct packed_rrset_data*)nd; struct packed_rrset_data* newd = (struct packed_rrset_data*)nd;
struct packed_rrset_data* cached = (struct packed_rrset_data*)cd; struct packed_rrset_data* cached = (struct packed_rrset_data*)cd;
@ -181,7 +181,7 @@ rrset_update_id(struct rrset_ref* ref, struct alloc_cache* alloc)
int int
rrset_cache_update(struct rrset_cache* r, struct rrset_ref* ref, rrset_cache_update(struct rrset_cache* r, struct rrset_ref* ref,
struct alloc_cache* alloc, uint32_t timenow) struct alloc_cache* alloc, time_t timenow)
{ {
struct lruhash_entry* e; struct lruhash_entry* e;
struct ub_packed_rrset_key* k = ref->key; struct ub_packed_rrset_key* k = ref->key;
@ -237,7 +237,7 @@ rrset_cache_update(struct rrset_cache* r, struct rrset_ref* ref,
struct ub_packed_rrset_key* struct ub_packed_rrset_key*
rrset_cache_lookup(struct rrset_cache* r, uint8_t* qname, size_t qnamelen, rrset_cache_lookup(struct rrset_cache* r, uint8_t* qname, size_t qnamelen,
uint16_t qtype, uint16_t qclass, uint32_t flags, uint32_t timenow, uint16_t qtype, uint16_t qclass, uint32_t flags, time_t timenow,
int wr) int wr)
{ {
struct lruhash_entry* e; struct lruhash_entry* e;
@ -268,7 +268,7 @@ rrset_cache_lookup(struct rrset_cache* r, uint8_t* qname, size_t qnamelen,
} }
int int
rrset_array_lock(struct rrset_ref* ref, size_t count, uint32_t timenow) rrset_array_lock(struct rrset_ref* ref, size_t count, time_t timenow)
{ {
size_t i; size_t i;
for(i=0; i<count; i++) { for(i=0; i<count; i++) {
@ -327,7 +327,7 @@ rrset_array_unlock_touch(struct rrset_cache* r, struct regional* scratch,
void void
rrset_update_sec_status(struct rrset_cache* r, rrset_update_sec_status(struct rrset_cache* r,
struct ub_packed_rrset_key* rrset, uint32_t now) struct ub_packed_rrset_key* rrset, time_t now)
{ {
struct packed_rrset_data* updata = struct packed_rrset_data* updata =
(struct packed_rrset_data*)rrset->entry.data; (struct packed_rrset_data*)rrset->entry.data;
@ -366,7 +366,7 @@ rrset_update_sec_status(struct rrset_cache* r,
void void
rrset_check_sec_status(struct rrset_cache* r, rrset_check_sec_status(struct rrset_cache* r,
struct ub_packed_rrset_key* rrset, uint32_t now) struct ub_packed_rrset_key* rrset, time_t now)
{ {
struct packed_rrset_data* updata = struct packed_rrset_data* updata =
(struct packed_rrset_data*)rrset->entry.data; (struct packed_rrset_data*)rrset->entry.data;

10
services/cache/rrset.h vendored
View file

@ -131,7 +131,7 @@ void rrset_cache_touch(struct rrset_cache* r, struct ub_packed_rrset_key* key,
* also the rdata is equal (but other parameters in cache are superior). * also the rdata is equal (but other parameters in cache are superior).
*/ */
int rrset_cache_update(struct rrset_cache* r, struct rrset_ref* ref, int rrset_cache_update(struct rrset_cache* r, struct rrset_ref* ref,
struct alloc_cache* alloc, uint32_t timenow); struct alloc_cache* alloc, time_t timenow);
/** /**
* Lookup rrset. You obtain read/write lock. You must unlock before lookup * Lookup rrset. You obtain read/write lock. You must unlock before lookup
@ -149,7 +149,7 @@ int rrset_cache_update(struct rrset_cache* r, struct rrset_ref* ref,
*/ */
struct ub_packed_rrset_key* rrset_cache_lookup(struct rrset_cache* r, struct ub_packed_rrset_key* rrset_cache_lookup(struct rrset_cache* r,
uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass, uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass,
uint32_t flags, uint32_t timenow, int wr); uint32_t flags, time_t timenow, int wr);
/** /**
* Obtain readlock on a (sorted) list of rrset references. * Obtain readlock on a (sorted) list of rrset references.
@ -163,7 +163,7 @@ struct ub_packed_rrset_key* rrset_cache_lookup(struct rrset_cache* r,
* RRsets have been purged from the cache. * RRsets have been purged from the cache.
* If true, you hold readlocks on all the ref items. * If true, you hold readlocks on all the ref items.
*/ */
int rrset_array_lock(struct rrset_ref* ref, size_t count, uint32_t timenow); int rrset_array_lock(struct rrset_ref* ref, size_t count, time_t timenow);
/** /**
* Unlock array (sorted) of rrset references. * Unlock array (sorted) of rrset references.
@ -199,7 +199,7 @@ void rrset_array_unlock_touch(struct rrset_cache* r, struct regional* scratch,
* @param now: current time. * @param now: current time.
*/ */
void rrset_update_sec_status(struct rrset_cache* r, void rrset_update_sec_status(struct rrset_cache* r,
struct ub_packed_rrset_key* rrset, uint32_t now); struct ub_packed_rrset_key* rrset, time_t now);
/** /**
* Looks up security status of an rrset. Looks up the rrset. * Looks up security status of an rrset. Looks up the rrset.
@ -211,7 +211,7 @@ void rrset_update_sec_status(struct rrset_cache* r,
* @param now: current time. * @param now: current time.
*/ */
void rrset_check_sec_status(struct rrset_cache* r, void rrset_check_sec_status(struct rrset_cache* r,
struct ub_packed_rrset_key* rrset, uint32_t now); struct ub_packed_rrset_key* rrset, time_t now);
/** /**
* Remove an rrset from the cache, by name and type and flags * Remove an rrset from the cache, by name and type and flags

10
services/localzone.c
View file

@ -225,7 +225,7 @@ lz_enter_zone(struct local_zones* zones, const char* name, const char* type,
/** return name and class and rdata of rr; parses string */ /** return name and class and rdata of rr; parses string */
static int static int
get_rr_content(const char* str, uint8_t** nm, uint16_t* type, get_rr_content(const char* str, uint8_t** nm, uint16_t* type,
uint16_t* dclass, uint32_t* ttl, ldns_buffer* rdata) uint16_t* dclass, time_t* ttl, ldns_buffer* rdata)
{ {
ldns_rr* rr = NULL; ldns_rr* rr = NULL;
ldns_status status = ldns_rr_new_frm_str(&rr, str, 3600, NULL, NULL); ldns_status status = ldns_rr_new_frm_str(&rr, str, 3600, NULL, NULL);
@ -244,7 +244,7 @@ get_rr_content(const char* str, uint8_t** nm, uint16_t* type,
} }
*dclass = ldns_rr_get_class(rr); *dclass = ldns_rr_get_class(rr);
*type = ldns_rr_get_type(rr); *type = ldns_rr_get_type(rr);
*ttl = (uint32_t)ldns_rr_ttl(rr); *ttl = (time_t)ldns_rr_ttl(rr);
ldns_buffer_clear(rdata); ldns_buffer_clear(rdata);
ldns_buffer_skip(rdata, 2); ldns_buffer_skip(rdata, 2);
status = ldns_rr_rdata2buffer_wire(rdata, rr); status = ldns_rr_rdata2buffer_wire(rdata, rr);
@ -356,10 +356,10 @@ new_local_rrset(struct regional* region, struct local_data* node,
/** insert RR into RRset data structure; Wastes a couple of bytes */ /** insert RR into RRset data structure; Wastes a couple of bytes */
static int static int
insert_rr(struct regional* region, struct packed_rrset_data* pd, insert_rr(struct regional* region, struct packed_rrset_data* pd,
ldns_buffer* buf, uint32_t ttl) ldns_buffer* buf, time_t ttl)
{ {
size_t* oldlen = pd->rr_len; size_t* oldlen = pd->rr_len;
uint32_t* oldttl = pd->rr_ttl; time_t* oldttl = pd->rr_ttl;
uint8_t** olddata = pd->rr_data; uint8_t** olddata = pd->rr_data;
/* add RR to rrset */ /* add RR to rrset */
@ -450,7 +450,7 @@ lz_enter_rr_into_zone(struct local_zone* z, ldns_buffer* buf,
struct local_rrset* rrset; struct local_rrset* rrset;
struct packed_rrset_data* pd; struct packed_rrset_data* pd;
uint16_t rrtype = 0, rrclass = 0; uint16_t rrtype = 0, rrclass = 0;
uint32_t ttl = 0; time_t ttl = 0;
if(!get_rr_content(rrstr, &nm, &rrtype, &rrclass, &ttl, buf)) { if(!get_rr_content(rrstr, &nm, &rrtype, &rrclass, &ttl, buf)) {
log_err("bad local-data: %s", rrstr); log_err("bad local-data: %s", rrstr);
return 0; return 0;

2
services/mesh.c
View file

@ -422,7 +422,7 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
} }
void mesh_new_prefetch(struct mesh_area* mesh, struct query_info* qinfo, void mesh_new_prefetch(struct mesh_area* mesh, struct query_info* qinfo,
uint16_t qflags, uint32_t leeway) uint16_t qflags, time_t leeway)
{ {
struct mesh_state* s = mesh_area_find(mesh, qinfo, qflags&BIT_RD, 0); struct mesh_state* s = mesh_area_find(mesh, qinfo, qflags&BIT_RD, 0);
#ifdef UNBOUND_DEBUG #ifdef UNBOUND_DEBUG

2
services/mesh.h
View file

@ -307,7 +307,7 @@ int mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
* @param leeway: TTL leeway what to expire earlier for this update. * @param leeway: TTL leeway what to expire earlier for this update.
*/ */
void mesh_new_prefetch(struct mesh_area* mesh, struct query_info* qinfo, void mesh_new_prefetch(struct mesh_area* mesh, struct query_info* qinfo,
uint16_t qflags, uint32_t leeway); uint16_t qflags, time_t leeway);
/** /**
* Handle new event from the wire. A serviced query has returned. * Handle new event from the wire. A serviced query has returned.

14
services/outside_network.c
View file

@ -1361,7 +1361,7 @@ serviced_udp_send(struct serviced_query* sq, ldns_buffer* buff)
{ {
int rtt, vs; int rtt, vs;
uint8_t edns_lame_known; uint8_t edns_lame_known;
uint32_t now = *sq->outnet->now_secs; time_t now = *sq->outnet->now_secs;
if(!infra_host(sq->outnet->infra, &sq->addr, sq->addrlen, sq->zone, if(!infra_host(sq->outnet->infra, &sq->addr, sq->addrlen, sq->zone,
sq->zonelen, now, &vs, &edns_lame_known, &rtt)) sq->zonelen, now, &vs, &edns_lame_known, &rtt))
@ -1576,7 +1576,7 @@ serviced_tcp_callback(struct comm_point* c, void* arg, int error,
if(roundtime < TCP_AUTH_QUERY_TIMEOUT*1000) { if(roundtime < TCP_AUTH_QUERY_TIMEOUT*1000) {
if(!infra_rtt_update(sq->outnet->infra, &sq->addr, if(!infra_rtt_update(sq->outnet->infra, &sq->addr,
sq->addrlen, sq->zone, sq->zonelen, sq->qtype, sq->addrlen, sq->zone, sq->zonelen, sq->qtype,
roundtime, sq->last_rtt, (uint32_t)now.tv_sec)) roundtime, sq->last_rtt, (time_t)now.tv_sec))
log_err("out of memory noting rtt."); log_err("out of memory noting rtt.");
} }
} }
@ -1668,7 +1668,7 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error,
sq->retry++; sq->retry++;
if(!(rto=infra_rtt_update(outnet->infra, &sq->addr, sq->addrlen, if(!(rto=infra_rtt_update(outnet->infra, &sq->addr, sq->addrlen,
sq->zone, sq->zonelen, sq->qtype, -1, sq->last_rtt, sq->zone, sq->zonelen, sq->qtype, -1, sq->last_rtt,
(uint32_t)now.tv_sec))) (time_t)now.tv_sec)))
log_err("out of memory in UDP exponential backoff"); log_err("out of memory in UDP exponential backoff");
if(sq->retry < OUTBOUND_UDP_RETRY) { if(sq->retry < OUTBOUND_UDP_RETRY) {
log_name_addr(VERB_ALGO, "retry query", sq->qbuf+10, log_name_addr(VERB_ALGO, "retry query", sq->qbuf+10,
@ -1712,7 +1712,7 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error,
/* only store noEDNS in cache if domain is noDNSSEC */ /* only store noEDNS in cache if domain is noDNSSEC */
if(!sq->want_dnssec) if(!sq->want_dnssec)
if(!infra_edns_update(outnet->infra, &sq->addr, sq->addrlen, if(!infra_edns_update(outnet->infra, &sq->addr, sq->addrlen,
sq->zone, sq->zonelen, -1, (uint32_t)now.tv_sec)) { sq->zone, sq->zonelen, -1, (time_t)now.tv_sec)) {
log_err("Out of memory caching no edns for host"); log_err("Out of memory caching no edns for host");
} }
sq->status = serviced_query_UDP; sq->status = serviced_query_UDP;
@ -1722,7 +1722,7 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error,
log_addr(VERB_ALGO, "serviced query: EDNS works for", log_addr(VERB_ALGO, "serviced query: EDNS works for",
&sq->addr, sq->addrlen); &sq->addr, sq->addrlen);
if(!infra_edns_update(outnet->infra, &sq->addr, sq->addrlen, if(!infra_edns_update(outnet->infra, &sq->addr, sq->addrlen,
sq->zone, sq->zonelen, 0, (uint32_t)now.tv_sec)) { sq->zone, sq->zonelen, 0, (time_t)now.tv_sec)) {
log_err("Out of memory caching edns works"); log_err("Out of memory caching edns works");
} }
sq->edns_lame_known = 1; sq->edns_lame_known = 1;
@ -1739,7 +1739,7 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error,
log_addr(VERB_ALGO, "serviced query: EDNS fails for", log_addr(VERB_ALGO, "serviced query: EDNS fails for",
&sq->addr, sq->addrlen); &sq->addr, sq->addrlen);
if(!infra_edns_update(outnet->infra, &sq->addr, sq->addrlen, if(!infra_edns_update(outnet->infra, &sq->addr, sq->addrlen,
sq->zone, sq->zonelen, -1, (uint32_t)now.tv_sec)) { sq->zone, sq->zonelen, -1, (time_t)now.tv_sec)) {
log_err("Out of memory caching no edns for host"); log_err("Out of memory caching no edns for host");
} }
} else { } else {
@ -1762,7 +1762,7 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error,
if(roundtime < 60000) { if(roundtime < 60000) {
if(!infra_rtt_update(outnet->infra, &sq->addr, sq->addrlen, if(!infra_rtt_update(outnet->infra, &sq->addr, sq->addrlen,
sq->zone, sq->zonelen, sq->qtype, roundtime, sq->zone, sq->zonelen, sq->qtype, roundtime,
sq->last_rtt, (uint32_t)now.tv_sec)) sq->last_rtt, (time_t)now.tv_sec))
log_err("out of memory noting rtt."); log_err("out of memory noting rtt.");
} }
} }

2
services/outside_network.h
View file

@ -63,7 +63,7 @@ struct outside_network {
/** Base for select calls */ /** Base for select calls */
struct comm_base* base; struct comm_base* base;
/** pointer to time in seconds */ /** pointer to time in seconds */
uint32_t* now_secs; time_t* now_secs;
/** pointer to time in microseconds */ /** pointer to time in microseconds */
struct timeval* now_tv; struct timeval* now_tv;

4
testcode/fake_event.c
View file

@ -478,7 +478,7 @@ time_passes(struct replay_runtime* runtime, struct replay_moment* mom)
#endif #endif
} }
timeval_add(&runtime->now_tv, &tv); timeval_add(&runtime->now_tv, &tv);
runtime->now_secs = (uint32_t)runtime->now_tv.tv_sec; runtime->now_secs = (time_t)runtime->now_tv.tv_sec;
#ifndef S_SPLINT_S #ifndef S_SPLINT_S
log_info("elapsed %d.%6.6d now %d.%6.6d", log_info("elapsed %d.%6.6d now %d.%6.6d",
(int)tv.tv_sec, (int)tv.tv_usec, (int)tv.tv_sec, (int)tv.tv_usec,
@ -801,7 +801,7 @@ comm_base_delete(struct comm_base* b)
} }
void void
comm_base_timept(struct comm_base* b, uint32_t** tt, struct timeval** tv) comm_base_timept(struct comm_base* b, time_t** tt, struct timeval** tv)
{ {
struct replay_runtime* runtime = (struct replay_runtime*)b; struct replay_runtime* runtime = (struct replay_runtime*)b;
*tt = &runtime->now_secs; *tt = &runtime->now_secs;

10
testcode/replay.c
View file

@ -792,15 +792,15 @@ macro_expand(rbtree_t* store, struct replay_runtime* runtime, char** text)
/* check for functions */ /* check for functions */
if(strcmp(buf, "time") == 0) { if(strcmp(buf, "time") == 0) {
snprintf(buf, sizeof(buf), "%u", (unsigned)runtime->now_secs); snprintf(buf, sizeof(buf), "%lld", (long long)runtime->now_secs);
*text += len; *text += len;
return strdup(buf); return strdup(buf);
} else if(strcmp(buf, "timeout") == 0) { } else if(strcmp(buf, "timeout") == 0) {
uint32_t res = 0; time_t res = 0;
struct fake_timer* t = first_timer(runtime); struct fake_timer* t = first_timer(runtime);
if(t && (uint32_t)t->tv.tv_sec >= runtime->now_secs) if(t && (time_t)t->tv.tv_sec >= runtime->now_secs)
res = (uint32_t)t->tv.tv_sec - runtime->now_secs; res = (time_t)t->tv.tv_sec - runtime->now_secs;
snprintf(buf, sizeof(buf), "%u", (unsigned)res); snprintf(buf, sizeof(buf), "%lld", (long long)res);
*text += len; *text += len;
return strdup(buf); return strdup(buf);
} else if(strncmp(buf, "ctime ", 6) == 0 || } else if(strncmp(buf, "ctime ", 6) == 0 ||

2
testcode/replay.h
View file

@ -293,7 +293,7 @@ struct replay_runtime {
struct infra_cache* infra; struct infra_cache* infra;
/** the current time in seconds */ /** the current time in seconds */
uint32_t now_secs; time_t now_secs;
/** the current time in microseconds */ /** the current time in microseconds */
struct timeval now_tv; struct timeval now_tv;

4
testcode/unitmsgparse.c
View file

@ -258,7 +258,7 @@ checkformerr(ldns_buffer* pkt)
/** performance test message encoding */ /** performance test message encoding */
static void static void
perf_encode(struct query_info* qi, struct reply_info* rep, uint16_t id, perf_encode(struct query_info* qi, struct reply_info* rep, uint16_t id,
uint16_t flags, ldns_buffer* out, uint32_t timenow, uint16_t flags, ldns_buffer* out, time_t timenow,
struct edns_data* edns) struct edns_data* edns)
{ {
static int num = 0; static int num = 0;
@ -299,7 +299,7 @@ perftestpkt(ldns_buffer* pkt, struct alloc_cache* alloc, ldns_buffer* out,
int ret; int ret;
uint16_t id; uint16_t id;
uint16_t flags; uint16_t flags;
uint32_t timenow = 0; time_t timenow = 0;
struct regional* region = regional_create(); struct regional* region = regional_create();
struct edns_data edns; struct edns_data edns;

2
testcode/unitneg.c
View file

@ -195,7 +195,7 @@ static void add_item(struct val_neg_cache* neg)
struct packed_rrset_data rd; struct packed_rrset_data rd;
struct ub_packed_rrset_key nsec; struct ub_packed_rrset_key nsec;
size_t rr_len; size_t rr_len;
uint32_t rr_ttl; time_t rr_ttl;
uint8_t* rr_data; uint8_t* rr_data;
char* zname = get_random_zone(); char* zname = get_random_zone();
char* from, *to; char* from, *to;

2
testcode/unitverify.c
View file

@ -301,7 +301,7 @@ verifytest_file(const char* fname, const char* at_date)
struct entry* list = read_datafile(fname, 1); struct entry* list = read_datafile(fname, 1);
struct module_env env; struct module_env env;
struct val_env ve; struct val_env ve;
uint32_t now = time(NULL); time_t now = time(NULL);
if(!list) if(!list)
fatal_exit("could not read %s: %s", fname, strerror(errno)); fatal_exit("could not read %s: %s", fname, strerror(errno));

14
util/config_file.c
View file

@ -366,9 +366,9 @@ int config_set_option(struct config_file* cfg, const char* opt,
else S_YNO("prefetch:", prefetch) else S_YNO("prefetch:", prefetch)
else S_YNO("prefetch-key:", prefetch_key) else S_YNO("prefetch-key:", prefetch_key)
else if(strcmp(opt, "cache-max-ttl:") == 0) else if(strcmp(opt, "cache-max-ttl:") == 0)
{ IS_NUMBER_OR_ZERO; cfg->max_ttl = atoi(val); MAX_TTL=cfg->max_ttl;} { IS_NUMBER_OR_ZERO; cfg->max_ttl = atoi(val); MAX_TTL=(uint32_t)cfg->max_ttl;}
else if(strcmp(opt, "cache-min-ttl:") == 0) else if(strcmp(opt, "cache-min-ttl:") == 0)
{ IS_NUMBER_OR_ZERO; cfg->min_ttl = atoi(val); MIN_TTL=cfg->min_ttl;} { IS_NUMBER_OR_ZERO; cfg->min_ttl = atoi(val); MIN_TTL=(uint32_t)cfg->min_ttl;}
else S_NUMBER_OR_ZERO("infra-host-ttl:", host_ttl) else S_NUMBER_OR_ZERO("infra-host-ttl:", host_ttl)
else S_POW2("infra-cache-slabs:", infra_cache_slabs) else S_POW2("infra-cache-slabs:", infra_cache_slabs)
else S_SIZET_NONZERO("infra-cache-numhosts:", infra_cache_numhosts) else S_SIZET_NONZERO("infra-cache-numhosts:", infra_cache_numhosts)
@ -429,8 +429,10 @@ int config_set_option(struct config_file* cfg, const char* opt,
else S_STR("python-script:", python_script) else S_STR("python-script:", python_script)
/* val_sig_skew_min and max are copied into val_env during init, /* val_sig_skew_min and max are copied into val_env during init,
* so this does not update val_env with set_option */ * so this does not update val_env with set_option */
else S_NUMBER_OR_ZERO("val-sig-skew-min:", val_sig_skew_min) else if(strcmp(opt, "val-sig-skew-min:") == 0)
else S_NUMBER_OR_ZERO("val-sig-skew-max:", val_sig_skew_max) { IS_NUMBER_OR_ZERO; cfg->val_sig_skew_min = (int32_t)atoi(val); }
else if(strcmp(opt, "val-sig-skew-max:") == 0)
{ IS_NUMBER_OR_ZERO; cfg->val_sig_skew_max = (int32_t)atoi(val); }
else if (strcmp(opt, "outgoing-interface:") == 0) { else if (strcmp(opt, "outgoing-interface:") == 0) {
char* d = strdup(val); char* d = strdup(val);
char** oi = (char**)malloc((cfg->num_out_ifs+1)*sizeof(char*)); char** oi = (char**)malloc((cfg->num_out_ifs+1)*sizeof(char*));
@ -1062,10 +1064,10 @@ cfg_str2list_insert(struct config_str2list** head, char* item, char* i2)
return 1; return 1;
} }
uint32_t time_t
cfg_convert_timeval(const char* str) cfg_convert_timeval(const char* str)
{ {
uint32_t t; time_t t;
struct tm tm; struct tm tm;
memset(&tm, 0, sizeof(tm)); memset(&tm, 0, sizeof(tm));
if(strlen(str) < 14) if(strlen(str) < 14)

2
util/config_file.h
View file

@ -496,7 +496,7 @@ void config_delstubs(struct config_stub* list);
* @param str: string of 14 digits * @param str: string of 14 digits
* @return time value or 0 for error. * @return time value or 0 for error.
*/ */
uint32_t cfg_convert_timeval(const char* str); time_t cfg_convert_timeval(const char* str);
/** /**
* Count number of values in the string. * Count number of values in the string.

8
util/data/msgencode.c
View file

@ -441,7 +441,7 @@ rrset_belongs_in_reply(ldns_pkt_section s, uint16_t rrtype, uint16_t qtype,
/** store rrset in buffer in wireformat, return RETVAL_* */ /** store rrset in buffer in wireformat, return RETVAL_* */
static int static int
packed_rrset_encode(struct ub_packed_rrset_key* key, ldns_buffer* pkt, packed_rrset_encode(struct ub_packed_rrset_key* key, ldns_buffer* pkt,
uint16_t* num_rrs, uint32_t timenow, struct regional* region, uint16_t* num_rrs, time_t timenow, struct regional* region,
int do_data, int do_sig, struct compress_tree_node** tree, int do_data, int do_sig, struct compress_tree_node** tree,
ldns_pkt_section s, uint16_t qtype, int dnssec, size_t rr_offset) ldns_pkt_section s, uint16_t qtype, int dnssec, size_t rr_offset)
{ {
@ -528,7 +528,7 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, ldns_buffer* pkt,
/** store msg section in wireformat buffer, return RETVAL_* */ /** store msg section in wireformat buffer, return RETVAL_* */
static int static int
insert_section(struct reply_info* rep, size_t num_rrsets, uint16_t* num_rrs, insert_section(struct reply_info* rep, size_t num_rrsets, uint16_t* num_rrs,
ldns_buffer* pkt, size_t rrsets_before, uint32_t timenow, ldns_buffer* pkt, size_t rrsets_before, time_t timenow,
struct regional* region, struct compress_tree_node** tree, struct regional* region, struct compress_tree_node** tree,
ldns_pkt_section s, uint16_t qtype, int dnssec, size_t rr_offset) ldns_pkt_section s, uint16_t qtype, int dnssec, size_t rr_offset)
{ {
@ -624,7 +624,7 @@ positive_answer(struct reply_info* rep, uint16_t qtype) {
int int
reply_info_encode(struct query_info* qinfo, struct reply_info* rep, reply_info_encode(struct query_info* qinfo, struct reply_info* rep,
uint16_t id, uint16_t flags, ldns_buffer* buffer, uint32_t timenow, uint16_t id, uint16_t flags, ldns_buffer* buffer, time_t timenow,
struct regional* region, uint16_t udpsize, int dnssec) struct regional* region, uint16_t udpsize, int dnssec)
{ {
uint16_t ancount=0, nscount=0, arcount=0; uint16_t ancount=0, nscount=0, arcount=0;
@ -748,7 +748,7 @@ attach_edns_record(ldns_buffer* pkt, struct edns_data* edns)
int int
reply_info_answer_encode(struct query_info* qinf, struct reply_info* rep, reply_info_answer_encode(struct query_info* qinf, struct reply_info* rep,
uint16_t id, uint16_t qflags, ldns_buffer* pkt, uint32_t timenow, uint16_t id, uint16_t qflags, ldns_buffer* pkt, time_t timenow,
int cached, struct regional* region, uint16_t udpsize, int cached, struct regional* region, uint16_t udpsize,
struct edns_data* edns, int dnssec, int secure) struct edns_data* edns, int dnssec, int secure)
{ {

4
util/data/msgencode.h
View file

@ -66,7 +66,7 @@ struct edns_data;
* @return: 0 on error (server failure). * @return: 0 on error (server failure).
*/ */
int reply_info_answer_encode(struct query_info* qinf, struct reply_info* rep, int reply_info_answer_encode(struct query_info* qinf, struct reply_info* rep,
uint16_t id, uint16_t qflags, ldns_buffer* dest, uint32_t timenow, uint16_t id, uint16_t qflags, ldns_buffer* dest, time_t timenow,
int cached, struct regional* region, uint16_t udpsize, int cached, struct regional* region, uint16_t udpsize,
struct edns_data* edns, int dnssec, int secure); struct edns_data* edns, int dnssec, int secure);
@ -88,7 +88,7 @@ int reply_info_answer_encode(struct query_info* qinf, struct reply_info* rep,
* 0 on error: malloc failure (no log_err has been done). * 0 on error: malloc failure (no log_err has been done).
*/ */
int reply_info_encode(struct query_info* qinfo, struct reply_info* rep, int reply_info_encode(struct query_info* qinfo, struct reply_info* rep,
uint16_t id, uint16_t flags, ldns_buffer* buffer, uint32_t timenow, uint16_t id, uint16_t flags, ldns_buffer* buffer, time_t timenow,
struct regional* region, uint16_t udpsize, int dnssec); struct regional* region, uint16_t udpsize, int dnssec);
/** /**

10
util/data/msgreply.c
View file

@ -79,7 +79,7 @@ parse_create_qinfo(ldns_buffer* pkt, struct msg_parse* msg,
/** constructor for replyinfo */ /** constructor for replyinfo */
static struct reply_info* static struct reply_info*
construct_reply_info_base(struct regional* region, uint16_t flags, size_t qd, construct_reply_info_base(struct regional* region, uint16_t flags, size_t qd,
uint32_t ttl, uint32_t prettl, size_t an, size_t ns, size_t ar, time_t ttl, time_t prettl, size_t an, size_t ns, size_t ar,
size_t total, enum sec_status sec) size_t total, enum sec_status sec)
{ {
struct reply_info* rep; struct reply_info* rep;
@ -154,7 +154,7 @@ repinfo_alloc_rrset_keys(struct reply_info* rep, struct alloc_cache* alloc,
/** do the rdata copy */ /** do the rdata copy */
static int static int
rdata_copy(ldns_buffer* pkt, struct packed_rrset_data* data, uint8_t* to, rdata_copy(ldns_buffer* pkt, struct packed_rrset_data* data, uint8_t* to,
struct rr_parse* rr, uint32_t* rr_ttl, uint16_t type) struct rr_parse* rr, time_t* rr_ttl, uint16_t type)
{ {
uint16_t pkt_len; uint16_t pkt_len;
const ldns_rr_descriptor* desc; const ldns_rr_descriptor* desc;
@ -245,7 +245,7 @@ parse_rr_copy(ldns_buffer* pkt, struct rrset_parse* pset,
data->rr_len = (size_t*)((uint8_t*)data + data->rr_len = (size_t*)((uint8_t*)data +
sizeof(struct packed_rrset_data)); sizeof(struct packed_rrset_data));
data->rr_data = (uint8_t**)&(data->rr_len[total]); data->rr_data = (uint8_t**)&(data->rr_len[total]);
data->rr_ttl = (uint32_t*)&(data->rr_data[total]); data->rr_ttl = (time_t*)&(data->rr_data[total]);
nextrdata = (uint8_t*)&(data->rr_ttl[total]); nextrdata = (uint8_t*)&(data->rr_ttl[total]);
for(i=0; i<data->count; i++) { for(i=0; i<data->count; i++) {
data->rr_len[i] = rr->size; data->rr_len[i] = rr->size;
@ -278,7 +278,7 @@ parse_create_rrset(ldns_buffer* pkt, struct rrset_parse* pset,
/* allocate */ /* allocate */
size_t s = sizeof(struct packed_rrset_data) + size_t s = sizeof(struct packed_rrset_data) +
(pset->rr_count + pset->rrsig_count) * (pset->rr_count + pset->rrsig_count) *
(sizeof(size_t)+sizeof(uint8_t*)+sizeof(uint32_t)) + (sizeof(size_t)+sizeof(uint8_t*)+sizeof(time_t)) +
pset->size; pset->size;
if(region) if(region)
*data = regional_alloc(region, s); *data = regional_alloc(region, s);
@ -465,7 +465,7 @@ reply_info_sortref(struct reply_info* rep)
} }
void void
reply_info_set_ttls(struct reply_info* rep, uint32_t timenow) reply_info_set_ttls(struct reply_info* rep, time_t timenow)
{ {
size_t i, j; size_t i, j;
rep->ttl += timenow; rep->ttl += timenow;

12
util/data/msgreply.h
View file

@ -116,21 +116,21 @@ struct reply_info {
*/ */
uint8_t qdcount; uint8_t qdcount;
/** 32 bit padding to pad struct member alignment to 64 bits. */
uint32_t padding;
/** /**
* TTL of the entire reply (for negative caching). * TTL of the entire reply (for negative caching).
* only for use when there are 0 RRsets in this message. * only for use when there are 0 RRsets in this message.
* if there are RRsets, check those instead. * if there are RRsets, check those instead.
*/ */
uint32_t ttl; time_t ttl;
/** /**
* TTL for prefetch. After it has expired, a prefetch is suitable. * TTL for prefetch. After it has expired, a prefetch is suitable.
* Smaller than the TTL, otherwise the prefetch would not happen. * Smaller than the TTL, otherwise the prefetch would not happen.
*/ */
uint32_t prefetch_ttl; time_t prefetch_ttl;
/** 32 bit padding to pad struct member alignment to 64 bits. */
uint32_t padding;
/** /**
* The security status from DNSSEC validation of this message. * The security status from DNSSEC validation of this message.
@ -253,7 +253,7 @@ void reply_info_sortref(struct reply_info* rep);
* Also refs must be filled in. * Also refs must be filled in.
* @param timenow: the current time. * @param timenow: the current time.
*/ */
void reply_info_set_ttls(struct reply_info* rep, uint32_t timenow); void reply_info_set_ttls(struct reply_info* rep, time_t timenow);
/** /**
* Delete reply_info and packed_rrsets (while they are not yet added to the * Delete reply_info and packed_rrsets (while they are not yet added to the

14
util/data/packed_rrset.c
View file

@ -183,7 +183,7 @@ packed_rrset_ptr_fixup(struct packed_rrset_data* data)
data->rr_len = (size_t*)((uint8_t*)data + data->rr_len = (size_t*)((uint8_t*)data +
sizeof(struct packed_rrset_data)); sizeof(struct packed_rrset_data));
data->rr_data = (uint8_t**)&(data->rr_len[total]); data->rr_data = (uint8_t**)&(data->rr_len[total]);
data->rr_ttl = (uint32_t*)&(data->rr_data[total]); data->rr_ttl = (time_t*)&(data->rr_data[total]);
nextrdata = (uint8_t*)&(data->rr_ttl[total]); nextrdata = (uint8_t*)&(data->rr_ttl[total]);
for(i=0; i<total; i++) { for(i=0; i<total; i++) {
data->rr_data[i] = nextrdata; data->rr_data[i] = nextrdata;
@ -215,7 +215,7 @@ get_cname_target(struct ub_packed_rrset_key* rrset, uint8_t** dname,
} }
void void
packed_rrset_ttl_add(struct packed_rrset_data* data, uint32_t add) packed_rrset_ttl_add(struct packed_rrset_data* data, time_t add)
{ {
size_t i; size_t i;
size_t total = data->count + data->rrsig_count; size_t total = data->count + data->rrsig_count;
@ -266,7 +266,7 @@ void log_rrset_key(enum verbosity_value v, const char* str,
ntohs(rrset->rk.type), ntohs(rrset->rk.rrset_class)); ntohs(rrset->rk.type), ntohs(rrset->rk.rrset_class));
} }
uint32_t time_t
ub_packed_rrset_ttl(struct ub_packed_rrset_key* key) ub_packed_rrset_ttl(struct ub_packed_rrset_key* key)
{ {
struct packed_rrset_data* d = (struct packed_rrset_data*)key-> struct packed_rrset_data* d = (struct packed_rrset_data*)key->
@ -276,7 +276,7 @@ ub_packed_rrset_ttl(struct ub_packed_rrset_key* key)
struct ub_packed_rrset_key* struct ub_packed_rrset_key*
packed_rrset_copy_region(struct ub_packed_rrset_key* key, packed_rrset_copy_region(struct ub_packed_rrset_key* key,
struct regional* region, uint32_t now) struct regional* region, time_t now)
{ {
struct ub_packed_rrset_key* ck = regional_alloc(region, struct ub_packed_rrset_key* ck = regional_alloc(region,
sizeof(struct ub_packed_rrset_key)); sizeof(struct ub_packed_rrset_key));
@ -315,7 +315,7 @@ packed_rrset_copy_region(struct ub_packed_rrset_key* key,
struct ub_packed_rrset_key* struct ub_packed_rrset_key*
packed_rrset_copy_alloc(struct ub_packed_rrset_key* key, packed_rrset_copy_alloc(struct ub_packed_rrset_key* key,
struct alloc_cache* alloc, uint32_t now) struct alloc_cache* alloc, time_t now)
{ {
struct packed_rrset_data* fd, *dd; struct packed_rrset_data* fd, *dd;
struct ub_packed_rrset_key* dk = alloc_special_obtain(alloc); struct ub_packed_rrset_key* dk = alloc_special_obtain(alloc);
@ -386,7 +386,7 @@ packed_rrset_heap_data(ldns_rr_list* rrset)
/* allocate */ /* allocate */
total = count + rrsig_count; total = count + rrsig_count;
len += sizeof(*data) + total*(sizeof(size_t) + sizeof(uint32_t) + len += sizeof(*data) + total*(sizeof(size_t) + sizeof(time_t) +
sizeof(uint8_t*)); sizeof(uint8_t*));
data = (struct packed_rrset_data*)calloc(1, len); data = (struct packed_rrset_data*)calloc(1, len);
if(!data) if(!data)
@ -399,7 +399,7 @@ packed_rrset_heap_data(ldns_rr_list* rrset)
data->rr_len = (size_t*)((uint8_t*)data + data->rr_len = (size_t*)((uint8_t*)data +
sizeof(struct packed_rrset_data)); sizeof(struct packed_rrset_data));
data->rr_data = (uint8_t**)&(data->rr_len[total]); data->rr_data = (uint8_t**)&(data->rr_len[total]);
data->rr_ttl = (uint32_t*)&(data->rr_data[total]); data->rr_ttl = (time_t*)&(data->rr_data[total]);
nextrdata = (uint8_t*)&(data->rr_ttl[total]); nextrdata = (uint8_t*)&(data->rr_ttl[total]);
/* fill out len, ttl, fields */ /* fill out len, ttl, fields */

12
util/data/packed_rrset.h
View file

@ -215,7 +215,7 @@ enum sec_status {
struct packed_rrset_data { struct packed_rrset_data {
/** TTL (in seconds like time()) of the rrset. /** TTL (in seconds like time()) of the rrset.
* Same for all RRs see rfc2181(5.2). */ * Same for all RRs see rfc2181(5.2). */
uint32_t ttl; time_t ttl;
/** number of rrs. */ /** number of rrs. */
size_t count; size_t count;
/** number of rrsigs, if 0 no rrsigs */ /** number of rrsigs, if 0 no rrsigs */
@ -227,7 +227,7 @@ struct packed_rrset_data {
/** length of every rr's rdata, rr_len[i] is size of rr_data[i]. */ /** length of every rr's rdata, rr_len[i] is size of rr_data[i]. */
size_t* rr_len; size_t* rr_len;
/** ttl of every rr. rr_ttl[i] ttl of rr i. */ /** ttl of every rr. rr_ttl[i] ttl of rr i. */
uint32_t *rr_ttl; time_t *rr_ttl;
/** /**
* Array of pointers to every rr's rdata. * Array of pointers to every rr's rdata.
* The rr_data[i] rdata is stored in uncompressed wireformat. * The rr_data[i] rdata is stored in uncompressed wireformat.
@ -281,7 +281,7 @@ size_t packed_rrset_sizeof(struct packed_rrset_data* data);
* @param key: rrset key, with data to examine. * @param key: rrset key, with data to examine.
* @return ttl value. * @return ttl value.
*/ */
uint32_t ub_packed_rrset_ttl(struct ub_packed_rrset_key* key); time_t ub_packed_rrset_ttl(struct ub_packed_rrset_key* key);
/** /**
* Calculate memory size of rrset entry. For hash table usage. * Calculate memory size of rrset entry. For hash table usage.
@ -343,7 +343,7 @@ void packed_rrset_ptr_fixup(struct packed_rrset_data* data);
* @param data: rrset data structure. Otherwise correctly filled in. * @param data: rrset data structure. Otherwise correctly filled in.
* @param add: how many seconds to add, pass time(0) for example. * @param add: how many seconds to add, pass time(0) for example.
*/ */
void packed_rrset_ttl_add(struct packed_rrset_data* data, uint32_t add); void packed_rrset_ttl_add(struct packed_rrset_data* data, time_t add);
/** /**
* Utility procedure to extract CNAME target name from its rdata. * Utility procedure to extract CNAME target name from its rdata.
@ -392,7 +392,7 @@ void log_rrset_key(enum verbosity_value v, const char* str,
*/ */
struct ub_packed_rrset_key* packed_rrset_copy_region( struct ub_packed_rrset_key* packed_rrset_copy_region(
struct ub_packed_rrset_key* key, struct regional* region, struct ub_packed_rrset_key* key, struct regional* region,
uint32_t now); time_t now);
/** /**
* Allocate rrset with malloc (from region or you are holding the lock). * Allocate rrset with malloc (from region or you are holding the lock).
@ -403,7 +403,7 @@ struct ub_packed_rrset_key* packed_rrset_copy_region(
*/ */
struct ub_packed_rrset_key* packed_rrset_copy_alloc( struct ub_packed_rrset_key* packed_rrset_copy_alloc(
struct ub_packed_rrset_key* key, struct alloc_cache* alloc, struct ub_packed_rrset_key* key, struct alloc_cache* alloc,
uint32_t now); time_t now);
/** /**
* Create a ub_packed_rrset_key allocated on the heap. * Create a ub_packed_rrset_key allocated on the heap.

4
util/log.c
View file

@ -73,7 +73,7 @@ static const char* ident="unbound";
static int logging_to_syslog = 0; static int logging_to_syslog = 0;
#endif /* HAVE_SYSLOG_H */ #endif /* HAVE_SYSLOG_H */
/** time to print in log, if NULL, use time(2) */ /** time to print in log, if NULL, use time(2) */
static uint32_t* log_now = NULL; static time_t* log_now = NULL;
/** print time in UTC or in secondsfrom1970 */ /** print time in UTC or in secondsfrom1970 */
static int log_time_asc = 0; static int log_time_asc = 0;
@ -151,7 +151,7 @@ void log_ident_set(const char* id)
ident = id; ident = id;
} }
void log_set_time(uint32_t* t) void log_set_time(time_t* t)
{ {
log_now = t; log_now = t;
} }

2
util/log.h
View file

@ -108,7 +108,7 @@ void log_ident_set(const char* id);
* @param t: the point is copied and used to find the time. * @param t: the point is copied and used to find the time.
* if NULL, time(2) is used. * if NULL, time(2) is used.
*/ */
void log_set_time(uint32_t* t); void log_set_time(time_t* t);
/** /**
* Set if the time value is printed ascii or decimal in log entries. * Set if the time value is printed ascii or decimal in log entries.

4
util/mini_event.c
View file

@ -79,13 +79,13 @@ settime(struct event_base* base)
return -1; return -1;
} }
#ifndef S_SPLINT_S #ifndef S_SPLINT_S
*base->time_secs = (uint32_t)base->time_tv->tv_sec; *base->time_secs = (time_t)base->time_tv->tv_sec;
#endif #endif
return 0; return 0;
} }
/** create event base */ /** create event base */
void *event_init(uint32_t* time_secs, struct timeval* time_tv) void *event_init(time_t* time_secs, struct timeval* time_tv)
{ {
struct event_base* base = (struct event_base*)malloc( struct event_base* base = (struct event_base*)malloc(
sizeof(struct event_base)); sizeof(struct event_base));

4
util/mini_event.h
View file

@ -103,7 +103,7 @@ struct event_base
/** if we need to exit */ /** if we need to exit */
int need_to_exit; int need_to_exit;
/** where to store time in seconds */ /** where to store time in seconds */
uint32_t* time_secs; time_t* time_secs;
/** where to store time in microseconds */ /** where to store time in microseconds */
struct timeval* time_tv; struct timeval* time_tv;
}; };
@ -134,7 +134,7 @@ struct event {
/* function prototypes (some are as they appear in event.h) */ /* function prototypes (some are as they appear in event.h) */
/** create event base */ /** create event base */
void *event_init(uint32_t* time_secs, struct timeval* time_tv); void *event_init(time_t* time_secs, struct timeval* time_tv);
/** get version */ /** get version */
const char *event_get_version(void); const char *event_get_version(void);
/** get polling method, select */ /** get polling method, select */

4
util/module.h
View file

@ -186,7 +186,7 @@ struct module_env {
/** random table to generate random numbers */ /** random table to generate random numbers */
struct ub_randstate* rnd; struct ub_randstate* rnd;
/** time in seconds, converted to integer */ /** time in seconds, converted to integer */
uint32_t* now; time_t* now;
/** time in microseconds. Relatively recent. */ /** time in microseconds. Relatively recent. */
struct timeval* now_tv; struct timeval* now_tv;
/** is validation required for messages, controls client-facing /** is validation required for messages, controls client-facing
@ -309,7 +309,7 @@ struct module_qstate {
/** mesh related information for this query */ /** mesh related information for this query */
struct mesh_state* mesh_info; struct mesh_state* mesh_info;
/** how many seconds before expiry is this prefetched (0 if not) */ /** how many seconds before expiry is this prefetched (0 if not) */
uint32_t prefetch_leeway; time_t prefetch_leeway;
}; };
/** /**

6
util/netevent.c
View file

@ -122,7 +122,7 @@ struct internal_base {
/** libevent event_base type. */ /** libevent event_base type. */
struct event_base* base; struct event_base* base;
/** seconds time pointer points here */ /** seconds time pointer points here */
uint32_t secs; time_t secs;
/** timeval with current time */ /** timeval with current time */
struct timeval now; struct timeval now;
/** the event used for slow_accept timeouts */ /** the event used for slow_accept timeouts */
@ -171,7 +171,7 @@ comm_base_now(struct comm_base* b)
if(gettimeofday(&b->eb->now, NULL) < 0) { if(gettimeofday(&b->eb->now, NULL) < 0) {
log_err("gettimeofday: %s", strerror(errno)); log_err("gettimeofday: %s", strerror(errno));
} }
b->eb->secs = (uint32_t)b->eb->now.tv_sec; b->eb->secs = (time_t)b->eb->now.tv_sec;
} }
#endif /* USE_MINI_EVENT */ #endif /* USE_MINI_EVENT */
@ -258,7 +258,7 @@ comm_base_delete(struct comm_base* b)
} }
void void
comm_base_timept(struct comm_base* b, uint32_t** tt, struct timeval** tv) comm_base_timept(struct comm_base* b, time_t** tt, struct timeval** tv)
{ {
*tt = &b->eb->secs; *tt = &b->eb->secs;
*tv = &b->eb->now; *tv = &b->eb->now;

2
util/netevent.h
View file

@ -308,7 +308,7 @@ void comm_base_delete(struct comm_base* b);
* @param tt: pointer to time in seconds is returned. * @param tt: pointer to time in seconds is returned.
* @param tv: pointer to time in microseconds is returned. * @param tv: pointer to time in microseconds is returned.
*/ */
void comm_base_timept(struct comm_base* b, uint32_t** tt, struct timeval** tv); void comm_base_timept(struct comm_base* b, time_t** tt, struct timeval** tv);
/** /**
* Dispatch the comm base events. * Dispatch the comm base events.

4
util/winsock_event.c
View file

@ -71,7 +71,7 @@ settime(struct event_base* base)
return -1; return -1;
} }
#ifndef S_SPLINT_S #ifndef S_SPLINT_S
*base->time_secs = (uint32_t)base->time_tv->tv_sec; *base->time_secs = (time_t)base->time_tv->tv_sec;
#endif #endif
return 0; return 0;
} }
@ -108,7 +108,7 @@ zero_waitfor(WSAEVENT waitfor[], WSAEVENT x)
} }
} }
void *event_init(uint32_t* time_secs, struct timeval* time_tv) void *event_init(time_t* time_secs, struct timeval* time_tv)
{ {
struct event_base* base = (struct event_base*)malloc( struct event_base* base = (struct event_base*)malloc(
sizeof(struct event_base)); sizeof(struct event_base));

4
util/winsock_event.h
View file

@ -129,7 +129,7 @@ struct event_base
/** if we need to exit */ /** if we need to exit */
int need_to_exit; int need_to_exit;
/** where to store time in seconds */ /** where to store time in seconds */
uint32_t* time_secs; time_t* time_secs;
/** where to store time in microseconds */ /** where to store time in microseconds */
struct timeval* time_tv; struct timeval* time_tv;
/** /**
@ -194,7 +194,7 @@ struct event {
}; };
/** create event base */ /** create event base */
void *event_init(uint32_t* time_secs, struct timeval* time_tv); void *event_init(time_t* time_secs, struct timeval* time_tv);
/** get version */ /** get version */
const char *event_get_version(void); const char *event_get_version(void);
/** get polling method (select,epoll) */ /** get polling method (select,epoll) */

40
validator/autotrust.c
View file

@ -242,7 +242,7 @@ parse_comments(char* str, struct autr_ta* ta)
if (pos < 0 || !timestamp) if (pos < 0 || !timestamp)
ta->last_change = 0; ta->last_change = 0;
else else
ta->last_change = (uint32_t)timestamp; ta->last_change = (time_t)timestamp;
free(comment); free(comment);
return 1; return 1;
@ -677,12 +677,12 @@ parse_var_line(char* line, struct val_anchors* anchors,
} else if(strncmp(line, ";;query_interval: ", 18) == 0) { } else if(strncmp(line, ";;query_interval: ", 18) == 0) {
if(!tp) return -1; if(!tp) return -1;
lock_basic_lock(&tp->lock); lock_basic_lock(&tp->lock);
tp->autr->query_interval = (uint32_t)parse_int(line+18, &r); tp->autr->query_interval = (time_t)parse_int(line+18, &r);
lock_basic_unlock(&tp->lock); lock_basic_unlock(&tp->lock);
} else if(strncmp(line, ";;retry_time: ", 14) == 0) { } else if(strncmp(line, ";;retry_time: ", 14) == 0) {
if(!tp) return -1; if(!tp) return -1;
lock_basic_lock(&tp->lock); lock_basic_lock(&tp->lock);
tp->autr->retry_time = (uint32_t)parse_int(line+14, &r); tp->autr->retry_time = (time_t)parse_int(line+14, &r);
lock_basic_unlock(&tp->lock); lock_basic_unlock(&tp->lock);
} }
return r; return r;
@ -1031,23 +1031,23 @@ verify_dnskey(struct module_env* env, struct val_env* ve,
} }
/** Find minimum expiration interval from signatures */ /** Find minimum expiration interval from signatures */
static uint32_t static time_t
min_expiry(struct module_env* env, ldns_rr_list* rrset) min_expiry(struct module_env* env, ldns_rr_list* rrset)
{ {
size_t i; size_t i;
uint32_t t, r = 15 * 24 * 3600; /* 15 days max */ int32_t t, r = 15 * 24 * 3600; /* 15 days max */
for(i=0; i<ldns_rr_list_rr_count(rrset); i++) { for(i=0; i<ldns_rr_list_rr_count(rrset); i++) {
ldns_rr* rr = ldns_rr_list_rr(rrset, i); ldns_rr* rr = ldns_rr_list_rr(rrset, i);
if(ldns_rr_get_type(rr) != LDNS_RR_TYPE_RRSIG) if(ldns_rr_get_type(rr) != LDNS_RR_TYPE_RRSIG)
continue; continue;
t = ldns_rdf2native_int32(ldns_rr_rrsig_expiration(rr)); t = ldns_rdf2native_int32(ldns_rr_rrsig_expiration(rr));
if(t - *env->now > 0) { if((int32_t)t - (int32_t)*env->now > 0) {
t -= *env->now; t -= *env->now;
if(t < r) if(t < r)
r = t; r = t;
} }
} }
return r; return (time_t)r;
} }
/** Is rr self-signed revoked key */ /** Is rr self-signed revoked key */
@ -1239,7 +1239,7 @@ add_key(struct trust_anchor* tp, ldns_rr* rr)
} }
/** get TTL from DNSKEY rrset */ /** get TTL from DNSKEY rrset */
static uint32_t static time_t
key_ttl(struct ub_packed_rrset_key* k) key_ttl(struct ub_packed_rrset_key* k)
{ {
struct packed_rrset_data* d = (struct packed_rrset_data*)k->entry.data; struct packed_rrset_data* d = (struct packed_rrset_data*)k->entry.data;
@ -1248,10 +1248,10 @@ key_ttl(struct ub_packed_rrset_key* k)
/** update the time values for the trustpoint */ /** update the time values for the trustpoint */
static void static void
set_tp_times(struct trust_anchor* tp, uint32_t rrsig_exp_interval, set_tp_times(struct trust_anchor* tp, time_t rrsig_exp_interval,
uint32_t origttl, int* changed) time_t origttl, int* changed)
{ {
uint32_t x, qi = tp->autr->query_interval, rt = tp->autr->retry_time; time_t x, qi = tp->autr->query_interval, rt = tp->autr->retry_time;
/* x = MIN(15days, ttl/2, expire/2) */ /* x = MIN(15days, ttl/2, expire/2) */
x = 15 * 24 * 3600; x = 15 * 24 * 3600;
@ -1762,15 +1762,15 @@ autr_cleanup_keys(struct trust_anchor* tp)
/** calculate next probe time */ /** calculate next probe time */
static time_t static time_t
calc_next_probe(struct module_env* env, uint32_t wait) calc_next_probe(struct module_env* env, time_t wait)
{ {
/* make it random, 90-100% */ /* make it random, 90-100% */
uint32_t rnd, rest; time_t rnd, rest;
if(wait < 3600) if(wait < 3600)
wait = 3600; wait = 3600;
rnd = wait/10; rnd = wait/10;
rest = wait-rnd; rest = wait-rnd;
rnd = (uint32_t)ub_random_max(env->rnd, (long int)rnd); rnd = (time_t)ub_random_max(env->rnd, (long int)rnd);
return (time_t)(*env->now + rest + rnd); return (time_t)(*env->now + rest + rnd);
} }
@ -1790,7 +1790,7 @@ reset_worker_timer(struct module_env* env)
{ {
struct timeval tv; struct timeval tv;
#ifndef S_SPLINT_S #ifndef S_SPLINT_S
uint32_t next = (uint32_t)wait_probe_time(env->anchors); time_t next = (time_t)wait_probe_time(env->anchors);
/* in case this is libunbound, no timer */ /* in case this is libunbound, no timer */
if(!env->probe_timer) if(!env->probe_timer)
return; return;
@ -2156,7 +2156,7 @@ probe_anchor(struct module_env* env, struct trust_anchor* tp)
/** fetch first to-probe trust-anchor and lock it and set retrytime */ /** fetch first to-probe trust-anchor and lock it and set retrytime */
static struct trust_anchor* static struct trust_anchor*
todo_probe(struct module_env* env, uint32_t* next) todo_probe(struct module_env* env, time_t* next)
{ {
struct trust_anchor* tp; struct trust_anchor* tp;
rbnode_t* el; rbnode_t* el;
@ -2171,9 +2171,9 @@ todo_probe(struct module_env* env, uint32_t* next)
lock_basic_lock(&tp->lock); lock_basic_lock(&tp->lock);
/* is it eligible? */ /* is it eligible? */
if((uint32_t)tp->autr->next_probe_time > *env->now) { if((time_t)tp->autr->next_probe_time > *env->now) {
/* no more to probe */ /* no more to probe */
*next = (uint32_t)tp->autr->next_probe_time - *env->now; *next = (time_t)tp->autr->next_probe_time - *env->now;
lock_basic_unlock(&tp->lock); lock_basic_unlock(&tp->lock);
lock_basic_unlock(&env->anchors->lock); lock_basic_unlock(&env->anchors->lock);
return NULL; return NULL;
@ -2188,11 +2188,11 @@ todo_probe(struct module_env* env, uint32_t* next)
return tp; return tp;
} }
uint32_t time_t
autr_probe_timer(struct module_env* env) autr_probe_timer(struct module_env* env)
{ {
struct trust_anchor* tp; struct trust_anchor* tp;
uint32_t next_probe = 3600; time_t next_probe = 3600;
int num = 0; int num = 0;
verbose(VERB_ALGO, "autotrust probe timer callback"); verbose(VERB_ALGO, "autotrust probe timer callback");
/* while there are still anchors to probe */ /* while there are still anchors to probe */

6
validator/autotrust.h
View file

@ -104,9 +104,9 @@ struct autr_point_data {
time_t next_probe_time; time_t next_probe_time;
/** when to query if !failed */ /** when to query if !failed */
uint32_t query_interval; time_t query_interval;
/** when to retry if failed */ /** when to retry if failed */
uint32_t retry_time; time_t retry_time;
/** /**
* How many times did it fail. diagnostic only (has no effect). * How many times did it fail. diagnostic only (has no effect).
@ -151,7 +151,7 @@ size_t autr_get_num_anchors(struct val_anchors* anchors);
* @return time of next probe (in seconds from now). * @return time of next probe (in seconds from now).
* If 0, then there is no next probe anymore (trust points deleted). * If 0, then there is no next probe anymore (trust points deleted).
*/ */
uint32_t autr_probe_timer(struct module_env* env); time_t autr_probe_timer(struct module_env* env);
/** probe tree compare function */ /** probe tree compare function */
int probetree_cmp(const void* x, const void* y); int probetree_cmp(const void* x, const void* y);

2
validator/val_anchor.c
View file

@ -900,7 +900,7 @@ assemble_it(struct trust_anchor* ta, size_t num, uint16_t type)
free(pkey); free(pkey);
return NULL; return NULL;
} }
pd->rr_ttl = (uint32_t*)malloc(num*sizeof(uint32_t)); pd->rr_ttl = (time_t*)malloc(num*sizeof(time_t));
if(!pd->rr_ttl) { if(!pd->rr_ttl) {
free(pd->rr_len); free(pd->rr_len);
free(pd); free(pd);

2
validator/val_kcache.c
View file

@ -126,7 +126,7 @@ key_cache_search(struct key_cache* kcache, uint8_t* name, size_t namelen,
struct key_entry_key* struct key_entry_key*
key_cache_obtain(struct key_cache* kcache, uint8_t* name, size_t namelen, key_cache_obtain(struct key_cache* kcache, uint8_t* name, size_t namelen,
uint16_t key_class, struct regional* region, uint32_t now) uint16_t key_class, struct regional* region, time_t now)
{ {
/* keep looking until we find a nonexpired entry */ /* keep looking until we find a nonexpired entry */
while(1) { while(1) {

2
validator/val_kcache.h
View file

@ -106,7 +106,7 @@ void key_cache_remove(struct key_cache* kcache,
*/ */
struct key_entry_key* key_cache_obtain(struct key_cache* kcache, struct key_entry_key* key_cache_obtain(struct key_cache* kcache,
uint8_t* name, size_t namelen, uint16_t key_class, uint8_t* name, size_t namelen, uint16_t key_class,
struct regional* region, uint32_t now); struct regional* region, time_t now);
/** /**
* Get memory in use by the key cache. * Get memory in use by the key cache.

10
validator/val_kentry.c
View file

@ -275,8 +275,8 @@ key_entry_setup(struct regional* region,
struct key_entry_key* struct key_entry_key*
key_entry_create_null(struct regional* region, key_entry_create_null(struct regional* region,
uint8_t* name, size_t namelen, uint16_t dclass, uint32_t ttl, uint8_t* name, size_t namelen, uint16_t dclass, time_t ttl,
uint32_t now) time_t now)
{ {
struct key_entry_key* k; struct key_entry_key* k;
struct key_entry_data* d; struct key_entry_data* d;
@ -294,7 +294,7 @@ key_entry_create_null(struct regional* region,
struct key_entry_key* struct key_entry_key*
key_entry_create_rrset(struct regional* region, key_entry_create_rrset(struct regional* region,
uint8_t* name, size_t namelen, uint16_t dclass, uint8_t* name, size_t namelen, uint16_t dclass,
struct ub_packed_rrset_key* rrset, uint8_t* sigalg, uint32_t now) struct ub_packed_rrset_key* rrset, uint8_t* sigalg, time_t now)
{ {
struct key_entry_key* k; struct key_entry_key* k;
struct key_entry_data* d; struct key_entry_data* d;
@ -321,8 +321,8 @@ key_entry_create_rrset(struct regional* region,
struct key_entry_key* struct key_entry_key*
key_entry_create_bad(struct regional* region, key_entry_create_bad(struct regional* region,
uint8_t* name, size_t namelen, uint16_t dclass, uint32_t ttl, uint8_t* name, size_t namelen, uint16_t dclass, time_t ttl,
uint32_t now) time_t now)
{ {
struct key_entry_key* k; struct key_entry_key* k;
struct key_entry_data* d; struct key_entry_data* d;

12
validator/val_kentry.h
View file

@ -75,7 +75,7 @@ struct key_entry_key {
*/ */
struct key_entry_data { struct key_entry_data {
/** the TTL of this entry (absolute time) */ /** the TTL of this entry (absolute time) */
uint32_t ttl; time_t ttl;
/** the key rrdata. can be NULL to signal keyless name. */ /** the key rrdata. can be NULL to signal keyless name. */
struct packed_rrset_data* rrset_data; struct packed_rrset_data* rrset_data;
/** not NULL sometimes to give reason why bogus */ /** not NULL sometimes to give reason why bogus */
@ -169,8 +169,8 @@ char* key_entry_get_reason(struct key_entry_key* kkey);
* @return new key entry or NULL on alloc failure * @return new key entry or NULL on alloc failure
*/ */
struct key_entry_key* key_entry_create_null(struct regional* region, struct key_entry_key* key_entry_create_null(struct regional* region,
uint8_t* name, size_t namelen, uint16_t dclass, uint32_t ttl, uint8_t* name, size_t namelen, uint16_t dclass, time_t ttl,
uint32_t now); time_t now);
/** /**
* Create a key entry from an rrset, in the given region. * Create a key entry from an rrset, in the given region.
@ -185,7 +185,7 @@ struct key_entry_key* key_entry_create_null(struct regional* region,
*/ */
struct key_entry_key* key_entry_create_rrset(struct regional* region, struct key_entry_key* key_entry_create_rrset(struct regional* region,
uint8_t* name, size_t namelen, uint16_t dclass, uint8_t* name, size_t namelen, uint16_t dclass,
struct ub_packed_rrset_key* rrset, uint8_t* sigalg, uint32_t now); struct ub_packed_rrset_key* rrset, uint8_t* sigalg, time_t now);
/** /**
* Create a bad entry, in the given region. * Create a bad entry, in the given region.
@ -198,8 +198,8 @@ struct key_entry_key* key_entry_create_rrset(struct regional* region,
* @return new key entry or NULL on alloc failure * @return new key entry or NULL on alloc failure
*/ */
struct key_entry_key* key_entry_create_bad(struct regional* region, struct key_entry_key* key_entry_create_bad(struct regional* region,
uint8_t* name, size_t namelen, uint16_t dclass, uint32_t ttl, uint8_t* name, size_t namelen, uint16_t dclass, time_t ttl,
uint32_t now); time_t now);
/** /**
* Obtain rrset from a key entry, allocated in region. * Obtain rrset from a key entry, allocated in region.

12
validator/val_neg.c
View file

@ -917,7 +917,7 @@ static int neg_closest_data(struct val_neg_zone* zone,
} }
int val_neg_dlvlookup(struct val_neg_cache* neg, uint8_t* qname, size_t len, int val_neg_dlvlookup(struct val_neg_cache* neg, uint8_t* qname, size_t len,
uint16_t qclass, struct rrset_cache* rrset_cache, uint32_t now) uint16_t qclass, struct rrset_cache* rrset_cache, time_t now)
{ {
/* lookup closest zone */ /* lookup closest zone */
struct val_neg_zone* zone; struct val_neg_zone* zone;
@ -1138,7 +1138,7 @@ static struct ub_packed_rrset_key*
grab_nsec(struct rrset_cache* rrset_cache, uint8_t* qname, size_t qname_len, grab_nsec(struct rrset_cache* rrset_cache, uint8_t* qname, size_t qname_len,
uint16_t qtype, uint16_t qclass, uint32_t flags, uint16_t qtype, uint16_t qclass, uint32_t flags,
struct regional* region, int checkbit, uint16_t checktype, struct regional* region, int checkbit, uint16_t checktype,
uint32_t now) time_t now)
{ {
struct ub_packed_rrset_key* r, *k = rrset_cache_lookup(rrset_cache, struct ub_packed_rrset_key* r, *k = rrset_cache_lookup(rrset_cache,
qname, qname_len, qtype, qclass, flags, now, 0); qname, qname_len, qtype, qclass, flags, now, 0);
@ -1225,7 +1225,7 @@ neg_params_ok(struct val_neg_zone* zone, struct ub_packed_rrset_key* rrset)
static struct ub_packed_rrset_key* static struct ub_packed_rrset_key*
neg_nsec3_getnc(struct val_neg_zone* zone, uint8_t* hashnc, size_t nclen, neg_nsec3_getnc(struct val_neg_zone* zone, uint8_t* hashnc, size_t nclen,
struct rrset_cache* rrset_cache, struct regional* region, struct rrset_cache* rrset_cache, struct regional* region,
uint32_t now, uint8_t* b32, size_t maxb32) time_t now, uint8_t* b32, size_t maxb32)
{ {
struct ub_packed_rrset_key* nc_rrset; struct ub_packed_rrset_key* nc_rrset;
struct val_neg_data* data; struct val_neg_data* data;
@ -1258,7 +1258,7 @@ neg_nsec3_getnc(struct val_neg_zone* zone, uint8_t* hashnc, size_t nclen,
static struct dns_msg* static struct dns_msg*
neg_nsec3_proof_ds(struct val_neg_zone* zone, uint8_t* qname, size_t qname_len, neg_nsec3_proof_ds(struct val_neg_zone* zone, uint8_t* qname, size_t qname_len,
int qlabs, ldns_buffer* buf, struct rrset_cache* rrset_cache, int qlabs, ldns_buffer* buf, struct rrset_cache* rrset_cache,
struct regional* region, uint32_t now, uint8_t* topname) struct regional* region, time_t now, uint8_t* topname)
{ {
struct dns_msg* msg; struct dns_msg* msg;
struct val_neg_data* data; struct val_neg_data* data;
@ -1356,7 +1356,7 @@ neg_nsec3_proof_ds(struct val_neg_zone* zone, uint8_t* qname, size_t qname_len,
* @param zone: val_neg_zone if we have one. * @param zone: val_neg_zone if we have one.
* @return false on lookup or alloc failure. * @return false on lookup or alloc failure.
*/ */
static int add_soa(struct rrset_cache* rrset_cache, uint32_t now, static int add_soa(struct rrset_cache* rrset_cache, time_t now,
struct regional* region, struct dns_msg* msg, struct val_neg_zone* zone) struct regional* region, struct dns_msg* msg, struct val_neg_zone* zone)
{ {
struct ub_packed_rrset_key* soa; struct ub_packed_rrset_key* soa;
@ -1388,7 +1388,7 @@ static int add_soa(struct rrset_cache* rrset_cache, uint32_t now,
struct dns_msg* struct dns_msg*
val_neg_getmsg(struct val_neg_cache* neg, struct query_info* qinfo, val_neg_getmsg(struct val_neg_cache* neg, struct query_info* qinfo,
struct regional* region, struct rrset_cache* rrset_cache, struct regional* region, struct rrset_cache* rrset_cache,
ldns_buffer* buf, uint32_t now, int addsoa, uint8_t* topname) ldns_buffer* buf, time_t now, int addsoa, uint8_t* topname)
{ {
struct dns_msg* msg; struct dns_msg* msg;
struct ub_packed_rrset_key* rrset; struct ub_packed_rrset_key* rrset;

4
validator/val_neg.h
View file

@ -229,7 +229,7 @@ void val_neg_addreferral(struct val_neg_cache* neg, struct reply_info* rep,
* thus, qname DLV qclass does not exist. * thus, qname DLV qclass does not exist.
*/ */
int val_neg_dlvlookup(struct val_neg_cache* neg, uint8_t* qname, size_t len, int val_neg_dlvlookup(struct val_neg_cache* neg, uint8_t* qname, size_t len,
uint16_t qclass, struct rrset_cache* rrset_cache, uint32_t now); uint16_t qclass, struct rrset_cache* rrset_cache, time_t now);
/** /**
* For the given query, try to get a reply out of the negative cache. * For the given query, try to get a reply out of the negative cache.
@ -255,7 +255,7 @@ int val_neg_dlvlookup(struct val_neg_cache* neg, uint8_t* qname, size_t len,
*/ */
struct dns_msg* val_neg_getmsg(struct val_neg_cache* neg, struct dns_msg* val_neg_getmsg(struct val_neg_cache* neg,
struct query_info* qinfo, struct regional* region, struct query_info* qinfo, struct regional* region,
struct rrset_cache* rrset_cache, ldns_buffer* buf, uint32_t now, struct rrset_cache* rrset_cache, ldns_buffer* buf, time_t now,
int addsoa, uint8_t* topname); int addsoa, uint8_t* topname);

2
validator/val_nsec.c
View file

@ -197,7 +197,7 @@ nsec_verify_rrset(struct module_env* env, struct val_env* ve,
enum sec_status enum sec_status
val_nsec_prove_nodata_dsreply(struct module_env* env, struct val_env* ve, val_nsec_prove_nodata_dsreply(struct module_env* env, struct val_env* ve,
struct query_info* qinfo, struct reply_info* rep, struct query_info* qinfo, struct reply_info* rep,
struct key_entry_key* kkey, uint32_t* proof_ttl, char** reason) struct key_entry_key* kkey, time_t* proof_ttl, char** reason)
{ {
struct ub_packed_rrset_key* nsec = reply_find_rrset_section_ns( struct ub_packed_rrset_key* nsec = reply_find_rrset_section_ns(
rep, qinfo->qname, qinfo->qname_len, LDNS_RR_TYPE_NSEC, rep, qinfo->qname, qinfo->qname_len, LDNS_RR_TYPE_NSEC,

2
validator/val_nsec.h
View file

@ -73,7 +73,7 @@ struct key_entry_key;
enum sec_status val_nsec_prove_nodata_dsreply(struct module_env* env, enum sec_status val_nsec_prove_nodata_dsreply(struct module_env* env,
struct val_env* ve, struct query_info* qinfo, struct val_env* ve, struct query_info* qinfo,
struct reply_info* rep, struct key_entry_key* kkey, struct reply_info* rep, struct key_entry_key* kkey,
uint32_t* proof_ttl, char** reason); time_t* proof_ttl, char** reason);
/** /**
* nsec typemap check, takes an NSEC-type bitmap as argument, checks for type. * nsec typemap check, takes an NSEC-type bitmap as argument, checks for type.

8
validator/val_sigcrypt.c
View file

@ -579,7 +579,7 @@ dnskey_verify_rrset(struct module_env* env, struct val_env* ve,
enum sec_status enum sec_status
dnskeyset_verify_rrset_sig(struct module_env* env, struct val_env* ve, dnskeyset_verify_rrset_sig(struct module_env* env, struct val_env* ve,
uint32_t now, struct ub_packed_rrset_key* rrset, time_t now, struct ub_packed_rrset_key* rrset,
struct ub_packed_rrset_key* dnskey, size_t sig_idx, struct ub_packed_rrset_key* dnskey, size_t sig_idx,
struct rbtree_t** sortree, char** reason) struct rbtree_t** sortree, char** reason)
{ {
@ -1220,12 +1220,12 @@ adjust_ttl(struct val_env* ve, uint32_t unow,
* *
* Use the smallest of these. * Use the smallest of these.
*/ */
if(d->ttl > (uint32_t)origttl) { if(d->ttl > (time_t)origttl) {
verbose(VERB_QUERY, "rrset TTL larger than original TTL," verbose(VERB_QUERY, "rrset TTL larger than original TTL,"
" adjusting TTL downwards"); " adjusting TTL downwards");
d->ttl = origttl; d->ttl = origttl;
} }
if(expittl > 0 && d->ttl > (uint32_t)expittl) { if(expittl > 0 && d->ttl > (time_t)expittl) {
verbose(VERB_ALGO, "rrset TTL larger than sig expiration ttl," verbose(VERB_ALGO, "rrset TTL larger than sig expiration ttl,"
" adjusting TTL downwards"); " adjusting TTL downwards");
d->ttl = expittl; d->ttl = expittl;
@ -1234,7 +1234,7 @@ adjust_ttl(struct val_env* ve, uint32_t unow,
enum sec_status enum sec_status
dnskey_verify_rrset_sig(struct regional* region, ldns_buffer* buf, dnskey_verify_rrset_sig(struct regional* region, ldns_buffer* buf,
struct val_env* ve, uint32_t now, struct val_env* ve, time_t now,
struct ub_packed_rrset_key* rrset, struct ub_packed_rrset_key* dnskey, struct ub_packed_rrset_key* rrset, struct ub_packed_rrset_key* dnskey,
size_t dnskey_idx, size_t sig_idx, size_t dnskey_idx, size_t sig_idx,
struct rbtree_t** sortree, int* buf_canon, char** reason) struct rbtree_t** sortree, int* buf_canon, char** reason)

4
validator/val_sigcrypt.h
View file

@ -274,7 +274,7 @@ enum sec_status dnskey_verify_rrset(struct module_env* env,
* or unchecked on error. * or unchecked on error.
*/ */
enum sec_status dnskeyset_verify_rrset_sig(struct module_env* env, enum sec_status dnskeyset_verify_rrset_sig(struct module_env* env,
struct val_env* ve, uint32_t now, struct ub_packed_rrset_key* rrset, struct val_env* ve, time_t now, struct ub_packed_rrset_key* rrset,
struct ub_packed_rrset_key* dnskey, size_t sig_idx, struct ub_packed_rrset_key* dnskey, size_t sig_idx,
struct rbtree_t** sortree, char** reason); struct rbtree_t** sortree, char** reason);
@ -298,7 +298,7 @@ enum sec_status dnskeyset_verify_rrset_sig(struct module_env* env,
* bogus if it did not validate. * bogus if it did not validate.
*/ */
enum sec_status dnskey_verify_rrset_sig(struct regional* region, enum sec_status dnskey_verify_rrset_sig(struct regional* region,
ldns_buffer* buf, struct val_env* ve, uint32_t now, ldns_buffer* buf, struct val_env* ve, time_t now,
struct ub_packed_rrset_key* rrset, struct ub_packed_rrset_key* dnskey, struct ub_packed_rrset_key* rrset, struct ub_packed_rrset_key* dnskey,
size_t dnskey_idx, size_t sig_idx, size_t dnskey_idx, size_t sig_idx,
struct rbtree_t** sortree, int* buf_canon, char** reason); struct rbtree_t** sortree, int* buf_canon, char** reason);

2
validator/validator.c
View file

@ -2398,7 +2398,7 @@ ds_response_to_ke(struct module_qstate* qstate, struct val_qstate* vq,
subtype == VAL_CLASS_NAMEERROR) { subtype == VAL_CLASS_NAMEERROR) {
/* NODATA means that the qname exists, but that there was /* NODATA means that the qname exists, but that there was
* no DS. This is a pretty normal case. */ * no DS. This is a pretty normal case. */
uint32_t proof_ttl = 0; time_t proof_ttl = 0;
enum sec_status sec; enum sec_status sec;
/* make sure there are NSECs or NSEC3s with signatures */ /* make sure there are NSECs or NSEC3s with signatures */