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

Allow for unset name in requests 

When there is a qname in the extensions
This commit is contained in:
Willem Toorop 2017-06-28 12:00:59 +02:00
parent ac084db231
commit 654005e4e7
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/general.c
View File

@ -554,10 +554,10 @@ getdns_general_ns(getdns_context *context, getdns_eventloop *loop,
size_t i; size_t i;
uint64_t now_ms = 0; uint64_t now_ms = 0;
if (!context || !name || (!callbackfn && !internal_cb)) if (!context || (!name && !extensions) || (!callbackfn && !internal_cb))
return GETDNS_RETURN_INVALID_PARAMETER; return GETDNS_RETURN_INVALID_PARAMETER;
if ((r = _getdns_validate_dname(name))) if (name && (r = _getdns_validate_dname(name)))
return r; return r;
if (extensions && (r = validate_extensions(extensions))) if (extensions && (r = validate_extensions(extensions)))
@ -685,7 +685,10 @@ _getdns_address_loop(getdns_context *context, getdns_eventloop *loop,
uint32_t value; uint32_t value;
getdns_network_req *netreq = NULL; getdns_network_req *netreq = NULL;
if (!my_extensions) { if (!name)
return GETDNS_RETURN_INVALID_PARAMETER;
else if (!my_extensions) {
if (!(my_extensions=getdns_dict_create_with_context(context))) if (!(my_extensions=getdns_dict_create_with_context(context)))
return GETDNS_RETURN_MEMORY_ERROR; return GETDNS_RETURN_MEMORY_ERROR;
} else if ( } else if (
@ -806,6 +809,10 @@ _getdns_service_loop(getdns_context *context, getdns_eventloop *loop,
{ {
getdns_return_t r; getdns_return_t r;
getdns_network_req *netreq = NULL; getdns_network_req *netreq = NULL;
if (!name)
return GETDNS_RETURN_INVALID_PARAMETER;
r = getdns_general_ns(context, loop, name, GETDNS_RRTYPE_SRV, r = getdns_general_ns(context, loop, name, GETDNS_RRTYPE_SRV,
extensions, userarg, &netreq, callback, NULL, 1); extensions, userarg, &netreq, callback, NULL, 1);
if (netreq && transaction_id) if (netreq && transaction_id)

35
src/request-internal.c
View File

@ -740,6 +740,7 @@ _getdns_dns_req_new(getdns_context *context, getdns_eventloop *loop,
*/ */
size_t max_query_sz, max_response_sz, netreq_sz, dnsreq_base_sz; size_t max_query_sz, max_response_sz, netreq_sz, dnsreq_base_sz;
uint8_t *region, *suffixes; uint8_t *region, *suffixes;
getdns_bindata *qname = NULL;
if (extensions == dnssec_ok_checking_disabled || if (extensions == dnssec_ok_checking_disabled ||
extensions == dnssec_ok_checking_disabled_roadblock_avoidance || extensions == dnssec_ok_checking_disabled_roadblock_avoidance ||
@ -862,7 +863,34 @@ _getdns_dns_req_new(getdns_context *context, getdns_eventloop *loop,
memcpy(suffixes, context->suffixes, context->suffixes_len); memcpy(suffixes, context->suffixes, context->suffixes_len);
result->append_name = context->append_name; result->append_name = context->append_name;
if (!strlen(name) || name[strlen(name)-1] == '.' || result->name_len = sizeof(result->name);
if (name) {
if (gldns_str2wire_dname_buf(
name, result->name, &result->name_len)) {
GETDNS_FREE(result->my_mf, result);
return NULL;
}
} else if (!extensions || (
getdns_dict_get_bindata(extensions, "/question/qname", &qname) &&
getdns_dict_get_bindata(
extensions, "/replies_tree/0/question/qname", &qname)) ||
qname->size > sizeof(result->name)) {
GETDNS_FREE(result->my_mf, result);
return NULL;
} else {
uint32_t qtype = request_type;
result->name_len = qname->size;
(void) memcpy(result->name, qname->data, qname->size);
if (!getdns_dict_get_int(
extensions, "/question/qtype", &qtype) ||
!getdns_dict_get_int(
extensions, "/replies_tree/0/question/qtype", &qtype))
request_type = qtype;
}
if (!name || !strlen(name) || name[strlen(name)-1] == '.' ||
result->append_name == GETDNS_APPEND_NAME_NEVER) { result->append_name == GETDNS_APPEND_NAME_NEVER) {
/* Absolute query string, no appending */ /* Absolute query string, no appending */
result->suffix_len = no_suffixes[0]; result->suffix_len = no_suffixes[0];
@ -873,11 +901,6 @@ _getdns_dns_req_new(getdns_context *context, getdns_eventloop *loop,
result->suffix = suffixes + 1; result->suffix = suffixes + 1;
result->suffix_appended = 0; result->suffix_appended = 0;
} }
result->name_len = sizeof(result->name);
if (gldns_str2wire_dname_buf(name, result->name, &result->name_len)) {
GETDNS_FREE(result->my_mf, result);
return NULL;
}
if (result->append_name == GETDNS_APPEND_NAME_ALWAYS || if (result->append_name == GETDNS_APPEND_NAME_ALWAYS ||
( result->append_name == GETDNS_APPEND_NAME_TO_SINGLE_LABEL_FIRST ( result->append_name == GETDNS_APPEND_NAME_TO_SINGLE_LABEL_FIRST
&& result->name[0] && result->name[result->name[0]+1] == 0)){ && result->name[0] && result->name[result->name[0]+1] == 0)){