diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-08-14 19:12:19 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-08-14 19:12:19 +0200 |
| commit | 93944333c52050ab31d509fcee2333f2e166d945 (patch) | |
| tree | 77e223a83bd35329987358ae6448a0ca661e731c /external/unbound/util/data | |
| parent | Merge pull request #369 (diff) | |
| download | monero-93944333c52050ab31d509fcee2333f2e166d945.tar.xz | |
update unbound
Diffstat (limited to 'external/unbound/util/data')
| -rw-r--r-- | external/unbound/util/data/msgencode.c | 2 | ||||
| -rw-r--r-- | external/unbound/util/data/msgreply.c | 6 | ||||
| -rw-r--r-- | external/unbound/util/data/msgreply.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/external/unbound/util/data/msgencode.c b/external/unbound/util/data/msgencode.c index f9a8c5f67..43464e9bb 100644 --- a/external/unbound/util/data/msgencode.c +++ b/external/unbound/util/data/msgencode.c @@ -283,7 +283,7 @@ compress_owner(struct ub_packed_rrset_key* key, sldns_buffer* pkt, size_t owner_pos, uint16_t* owner_ptr, int owner_labs) { struct compress_tree_node* p; - struct compress_tree_node** insertpt; + struct compress_tree_node** insertpt = NULL; if(!*owner_ptr) { /* compress first time dname */ if((p = compress_tree_lookup(tree, key->rk.dname, diff --git a/external/unbound/util/data/msgreply.c b/external/unbound/util/data/msgreply.c index b1d3df639..06593ffe1 100644 --- a/external/unbound/util/data/msgreply.c +++ b/external/unbound/util/data/msgreply.c @@ -822,13 +822,13 @@ log_query_info(enum verbosity_value v, const char* str, } int -reply_check_cname_chain(struct reply_info* rep) +reply_check_cname_chain(struct query_info* qinfo, struct reply_info* rep) { /* check only answer section rrs for matching cname chain. * the cache may return changed rdata, but owner names are untouched.*/ size_t i; - uint8_t* sname = rep->rrsets[0]->rk.dname; - size_t snamelen = rep->rrsets[0]->rk.dname_len; + uint8_t* sname = qinfo->qname; + size_t snamelen = qinfo->qname_len; for(i=0; i<rep->an_numrrsets; i++) { uint16_t t = ntohs(rep->rrsets[i]->rk.type); if(t == LDNS_RR_TYPE_DNAME) diff --git a/external/unbound/util/data/msgreply.h b/external/unbound/util/data/msgreply.h index e8d6d762e..708897950 100644 --- a/external/unbound/util/data/msgreply.h +++ b/external/unbound/util/data/msgreply.h @@ -359,10 +359,11 @@ uint8_t* reply_find_final_cname_target(struct query_info* qinfo, /** * Check if cname chain in cached reply is still valid. + * @param qinfo: query info with query name. * @param rep: reply to check. * @return: true if valid, false if invalid. */ -int reply_check_cname_chain(struct reply_info* rep); +int reply_check_cname_chain(struct query_info* qinfo, struct reply_info* rep); /** * Check security status of all RRs in the message. |