interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remote the ldns_pkt result from the netreq 

Proving that we don't need ldns_pkt any more
This commit is contained in:
Willem Toorop 2015-02-18 12:36:42 +01:00
parent a722778b3c
commit a77f156d08
4 changed files with 27 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dnssec.c
View File

@ -282,8 +282,18 @@ getdns_get_validation_chain(getdns_dns_req *dns_req, uint64_t *timeout)
}
for (netreq_p = dns_req->netreqs; (netreq = *netreq_p); netreq_p++) {
size_t i;
ldns_rr_list *answer = ldns_pkt_answer(netreq->result);
ldns_rr_list *authority = ldns_pkt_authority(netreq->result);
ldns_status r;
ldns_pkt *pkt;
ldns_rr_list *answer;
ldns_rr_list *authority;
if ((r = ldns_wire2pkt(&pkt,
netreq->response, netreq->response_len)))
continue;
answer = ldns_pkt_answer(pkt);
authority = ldns_pkt_authority(pkt);
for (i = 0; i < ldns_rr_list_rr_count(answer); i++) {
ldns_rr *rr = ldns_rr_list_rr(answer, i);
if (ldns_rr_get_type(rr) == LDNS_RR_TYPE_RRSIG)
@ -296,6 +306,7 @@ getdns_get_validation_chain(getdns_dns_req *dns_req, uint64_t *timeout)
launch_chain_link_lookup(chain,
ldns_rdf2str(ldns_rr_rdf(rr, 7)));
}
ldns_pkt_free(pkt);
}
callback_on_complete_chain(chain);
}

5
src/request-internal.c
View File

@ -59,9 +59,6 @@ network_req_cleanup(getdns_network_req *net_req)
{
assert(net_req);
if (net_req->result)
ldns_pkt_free(net_req->result);
if (net_req->response && (net_req->response < net_req->wire_data ||
net_req->response > net_req->wire_data+ net_req->wire_data_sz))
GETDNS_FREE(net_req->owner->my_mf, net_req->response);
@ -84,8 +81,6 @@ network_req_init(getdns_network_req *net_req, getdns_dns_req *owner,
size_t i;
int r = 0;
net_req->result = NULL;
net_req->request_type = request_type;
net_req->request_class = request_class;
net_req->unbound_id = -1;

1
src/types-internal.h
View File

@ -187,7 +187,6 @@ typedef struct getdns_network_req
uint16_t request_class;
/* result */
ldns_pkt *result;
int secure;
int bogus;

54
src/util-internal.c
View File

@ -551,7 +551,7 @@ dname_equal(uint8_t *s1, uint8_t *s2)
static getdns_dict *
create_reply_dict(getdns_context *context, getdns_network_req *req,
getdns_list *just_addrs)
getdns_list *just_addrs, int *rrsigs_in_answer)
{
/* turn a packet into this glorious structure
*
@ -610,6 +610,7 @@ create_reply_dict(getdns_context *context, getdns_network_req *req,
uint8_t owner_name_space[256], *owner_name;
size_t canonical_name_len = 256, owner_name_len;
int new_canonical = 0;
uint16_t rr_type;
if (!result)
goto error;
@ -644,10 +645,15 @@ create_reply_dict(getdns_context *context, getdns_network_req *req,
rr_dict = NULL;
rr_type = gldns_read_uint16(rr_iter->rr_type);
if (section > GLDNS_SECTION_QUESTION &&
rr_type == GETDNS_RRTYPE_RRSIG)
*rrsigs_in_answer = 1;
if (section != GLDNS_SECTION_ANSWER)
continue;
if (gldns_read_uint16(rr_iter->rr_type)==GETDNS_RRTYPE_CNAME) {
if (rr_type == GETDNS_RRTYPE_CNAME) {
owner_name = priv_getdns_owner_if_or_as_decompressed(
rr_iter, owner_name_space, &owner_name_len);
@ -664,9 +670,7 @@ create_reply_dict(getdns_context *context, getdns_network_req *req,
continue;
}
/* TODO: Get canonical name_from ANSWER RR's */
if (gldns_read_uint16(rr_iter->rr_type) != GETDNS_RRTYPE_A &&
gldns_read_uint16(rr_iter->rr_type) != GETDNS_RRTYPE_AAAA)
if (rr_type != GETDNS_RRTYPE_A && rr_type != GETDNS_RRTYPE_AAAA)
continue;
if (!(rdf_iter = priv_getdns_rdf_iter_init(
@ -678,10 +682,10 @@ create_reply_dict(getdns_context *context, getdns_network_req *req,
if (!(rr_dict = getdns_dict_create_with_context(context)) ||
getdns_dict_set_bindata(rr_dict, "address_type",
gldns_read_uint16(rr_iter->rr_type) == GETDNS_RRTYPE_A ?
rr_type == GETDNS_RRTYPE_A ?
&IPv4_str_bindata : &IPv6_str_bindata) ||
getdns_dict_set_bindata(rr_dict, "address_data",&bindata)||
getdns_dict_set_bindata(rr_dict,"address_data",&bindata) ||
getdns_list_append_dict(just_addrs, rr_dict)) {
@ -769,22 +773,6 @@ get_canonical_name(const char *name)
return result;
}
static int
rrsigs_in_answer(ldns_pkt *pkt)
{
ldns_rr_list *rr_list = ldns_pkt_answer(pkt);
size_t i;
if (! rr_list)
return 0;
for (i = 0; i < ldns_rr_list_rr_count(rr_list); i++)
if (LDNS_RR_TYPE_RRSIG ==
ldns_rr_get_type(ldns_rr_list_rr(rr_list, i)))
return 1;
return 0;
}
struct getdns_dict *
create_getdns_response(getdns_dns_req *completed_request)
{
@ -804,21 +792,6 @@ create_getdns_response(getdns_dns_req *completed_request)
/* info (bools) about dns_req */
int dnssec_return_status;
for ( netreq_p = completed_request->netreqs
; ! r && (netreq = *netreq_p)
; netreq_p++) {
if (! netreq->response_len)
continue;
if (ldns_wire2pkt(&(netreq->result), netreq->response,
netreq->response_len)) {
netreq->response_len = 0;
continue;
}
}
dnssec_return_status = completed_request->dnssec_return_status ||
completed_request->dnssec_return_only_secure;
@ -868,8 +841,9 @@ create_getdns_response(getdns_dns_req *completed_request)
}
size_t idx = 0;
/* reply tree */
int rrsigs_in_answer = 0;
struct getdns_dict *reply = create_reply_dict(
completed_request->context, netreq, just_addrs);
completed_request->context, netreq, just_addrs, &rrsigs_in_answer);
if (! reply) {
r = GETDNS_RETURN_MEMORY_ERROR;
@ -879,7 +853,7 @@ create_getdns_response(getdns_dns_req *completed_request)
r = getdns_dict_set_int(reply, "dnssec_status",
( netreq->secure ? GETDNS_DNSSEC_SECURE
: netreq->bogus ? GETDNS_DNSSEC_BOGUS
: rrsigs_in_answer(netreq->result) &&
: rrsigs_in_answer &&
completed_request->context->has_ta
? GETDNS_DNSSEC_INDETERMINATE
: GETDNS_DNSSEC_INSECURE ));