diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-01-02 17:35:29 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-01-02 17:35:29 +0000 |
| commit | 7954be7fa5ea70de36aacebb8bcca2a70af709f4 (patch) | |
| tree | b839bbb75392ad4c301a0393b3ca49fe155c5740 /daemon | |
| parent | 7f563e614fb9a8ce7c8904a3ad346b7e38238339 (diff) | |
| download | src-test2-7954be7fa5ea70de36aacebb8bcca2a70af709f4.tar.gz src-test2-7954be7fa5ea70de36aacebb8bcca2a70af709f4.zip | |
Notes
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/cachedump.c | 2 | ||||
| -rw-r--r-- | daemon/remote.c | 10 | ||||
| -rw-r--r-- | daemon/unbound.c | 2 | ||||
| -rw-r--r-- | daemon/worker.c | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/daemon/cachedump.c b/daemon/cachedump.c index cf5b1a12c9a7..20a46ae4dffb 100644 --- a/daemon/cachedump.c +++ b/daemon/cachedump.c @@ -664,7 +664,7 @@ load_msg(SSL* ssl, sldns_buffer* buf, struct worker* worker) if(!go_on) return 1; /* skip this one, not all references satisfied */ - if(!dns_cache_store(&worker->env, &qinf, &rep, 0, 0, 0, NULL)) { + if(!dns_cache_store(&worker->env, &qinf, &rep, 0, 0, 0, NULL, flags)) { log_warn("error out of memory"); return 0; } diff --git a/daemon/remote.c b/daemon/remote.c index 88ea063f21f8..ff3d769d4e54 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -854,7 +854,8 @@ print_ext(SSL* ssl, struct stats_info* s) /* RCODE */ for(i=0; i<STATS_RCODE_NUM; i++) { - if(inhibit_zero && s->svr.ans_rcode[i] == 0) + /* Always include RCODEs 0-5 */ + if(inhibit_zero && i > LDNS_RCODE_REFUSED && s->svr.ans_rcode[i] == 0) continue; lt = sldns_lookup_by_id(sldns_rcodes, i); if(lt && lt->name) { @@ -1094,8 +1095,13 @@ do_cache_remove(struct worker* worker, uint8_t* nm, size_t nmlen, k.qname_len = nmlen; k.qtype = t; k.qclass = c; - h = query_info_hash(&k); + h = query_info_hash(&k, 0); slabhash_remove(worker->env.msg_cache, h, &k); + if(t == LDNS_RR_TYPE_AAAA) { + /* for AAAA also flush dns64 bit_cd packet */ + h = query_info_hash(&k, BIT_CD); + slabhash_remove(worker->env.msg_cache, h, &k); + } } /** flush a type */ diff --git a/daemon/unbound.c b/daemon/unbound.c index a53fe954db26..5ded5a964cc3 100644 --- a/daemon/unbound.c +++ b/daemon/unbound.c @@ -287,7 +287,7 @@ checkrlimits(struct config_file* cfg) #ifdef HAVE_SETRLIMIT } #endif - log_warn("increased limit(open files) from %u to %u", + verbose(VERB_ALGO, "increased limit(open files) from %u to %u", (unsigned)avail, (unsigned)total+10); } #else diff --git a/daemon/worker.c b/daemon/worker.c index f9067621385b..59ae9dfcefcb 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -935,7 +935,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error, &repinfo->addr, repinfo->addrlen); goto send_reply; } - h = query_info_hash(&qinfo); + h = query_info_hash(&qinfo, sldns_buffer_read_u16_at(c->buffer, 2)); if((e=slabhash_lookup(worker->env.msg_cache, h, &qinfo, 0))) { /* answer from cache - we have acquired a readlock on it */ if(answer_from_cache(worker, &qinfo, |