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

Merge branch 'develop' of github.com:verisign/getdns into develop

This commit is contained in:
W.C.A. Wijngaards 2014-02-04 11:35:58 +01:00
parent 028b96ca14 374f5b09f4
commit f09f7ea981
2 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/context.c
View File

@ -433,7 +433,7 @@ getdns_context_set_context_update_callback(struct getdns_context *context,
void (*value) (struct getdns_context *context, uint16_t changed_item) void (*value) (struct getdns_context *context, uint16_t changed_item)
) )
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
context->update_callback = value; context->update_callback = value;
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} /* getdns_context_set_context_update_callback */ } /* getdns_context_set_context_update_callback */
@ -467,18 +467,6 @@ clear_resolution_type_set_flag(struct getdns_context *context, uint16_t type)
} }
} }
/*
* getdns_context_set_context_update
*
*/
getdns_return_t
getdns_context_set_context_update(struct getdns_context *context, uint16_t value)
{
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT);
UNUSED_PARAM(value);
return GETDNS_RETURN_GOOD;
} /* getdns_context_set_context_update */
/** /**
* Helper to dispatch the updated callback * Helper to dispatch the updated callback
*/ */
@ -497,7 +485,7 @@ dispatch_updated(struct getdns_context *context, uint16_t item)
getdns_return_t getdns_return_t
getdns_context_set_resolution_type(struct getdns_context *context, uint16_t value) getdns_context_set_resolution_type(struct getdns_context *context, uint16_t value)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
if (value != GETDNS_CONTEXT_STUB && value != GETDNS_CONTEXT_RECURSING) { if (value != GETDNS_CONTEXT_STUB && value != GETDNS_CONTEXT_RECURSING) {
return GETDNS_RETURN_CONTEXT_UPDATE_FAIL; return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
} }
@ -517,7 +505,7 @@ getdns_return_t
getdns_context_set_namespaces(struct getdns_context *context, getdns_context_set_namespaces(struct getdns_context *context,
size_t namespace_count, uint16_t * namespaces) size_t namespace_count, uint16_t * namespaces)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
if (namespace_count == 0 || namespaces == NULL) { if (namespace_count == 0 || namespaces == NULL) {
return GETDNS_RETURN_CONTEXT_UPDATE_FAIL; return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
} }
@ -543,7 +531,7 @@ getdns_context_set_namespaces(struct getdns_context *context,
getdns_return_t getdns_return_t
getdns_context_set_dns_transport(struct getdns_context *context, uint16_t value) getdns_context_set_dns_transport(struct getdns_context *context, uint16_t value)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
switch (value) { switch (value) {
case GETDNS_CONTEXT_UDP_FIRST_AND_FALL_BACK_TO_TCP: case GETDNS_CONTEXT_UDP_FIRST_AND_FALL_BACK_TO_TCP:
set_ub_string_opt(context, "do-udp", "yes"); set_ub_string_opt(context, "do-udp", "yes");
@ -575,7 +563,7 @@ getdns_return_t
getdns_context_set_limit_outstanding_queries(struct getdns_context *context, getdns_context_set_limit_outstanding_queries(struct getdns_context *context,
uint16_t limit) uint16_t limit)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
/* num-queries-per-thread */ /* num-queries-per-thread */
set_ub_number_opt(context, "num-queries-per-thread", limit); set_ub_number_opt(context, "num-queries-per-thread", limit);
@ -592,7 +580,7 @@ getdns_context_set_limit_outstanding_queries(struct getdns_context *context,
getdns_return_t getdns_return_t
getdns_context_set_timeout(struct getdns_context *context, uint16_t timeout) getdns_context_set_timeout(struct getdns_context *context, uint16_t timeout)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
context->timeout = timeout; context->timeout = timeout;
dispatch_updated(context, GETDNS_CONTEXT_CODE_TIMEOUT); dispatch_updated(context, GETDNS_CONTEXT_CODE_TIMEOUT);
@ -607,7 +595,7 @@ getdns_context_set_timeout(struct getdns_context *context, uint16_t timeout)
getdns_return_t getdns_return_t
getdns_context_set_follow_redirects(struct getdns_context *context, uint16_t value) getdns_context_set_follow_redirects(struct getdns_context *context, uint16_t value)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
context->follow_redirects = value; context->follow_redirects = value;
clear_resolution_type_set_flag(context, GETDNS_CONTEXT_RECURSING); clear_resolution_type_set_flag(context, GETDNS_CONTEXT_RECURSING);
@ -626,7 +614,7 @@ getdns_context_set_dns_root_servers(struct getdns_context *context,
{ {
struct getdns_list *copy = NULL; struct getdns_list *copy = NULL;
size_t count = 0; size_t count = 0;
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
if (addresses != NULL) { if (addresses != NULL) {
if (getdns_list_copy(addresses, &copy) != GETDNS_RETURN_GOOD) { if (getdns_list_copy(addresses, &copy) != GETDNS_RETURN_GOOD) {
return GETDNS_RETURN_CONTEXT_UPDATE_FAIL; return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
@ -672,7 +660,7 @@ getdns_context_set_dns_root_servers(struct getdns_context *context,
getdns_return_t getdns_return_t
getdns_context_set_append_name(struct getdns_context *context, uint16_t value) getdns_context_set_append_name(struct getdns_context *context, uint16_t value)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
if (value != GETDNS_CONTEXT_APPEND_NAME_ALWAYS && if (value != GETDNS_CONTEXT_APPEND_NAME_ALWAYS &&
value != value !=
GETDNS_CONTEXT_APPEND_NAME_ONLY_TO_SINGLE_LABEL_AFTER_FAILURE GETDNS_CONTEXT_APPEND_NAME_ONLY_TO_SINGLE_LABEL_AFTER_FAILURE
@ -697,7 +685,7 @@ getdns_return_t
getdns_context_set_suffix(struct getdns_context *context, struct getdns_list * value) getdns_context_set_suffix(struct getdns_context *context, struct getdns_list * value)
{ {
struct getdns_list *copy = NULL; struct getdns_list *copy = NULL;
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
if (value != NULL) { if (value != NULL) {
if (getdns_list_copy(value, &copy) != GETDNS_RETURN_GOOD) { if (getdns_list_copy(value, &copy) != GETDNS_RETURN_GOOD) {
return GETDNS_RETURN_CONTEXT_UPDATE_FAIL; return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
@ -723,7 +711,7 @@ getdns_context_set_dnssec_trust_anchors(struct getdns_context *context,
struct getdns_list * value) struct getdns_list * value)
{ {
struct getdns_list *copy = NULL; struct getdns_list *copy = NULL;
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
if (value != NULL) { if (value != NULL) {
if (getdns_list_copy(value, &copy) != GETDNS_RETURN_GOOD) { if (getdns_list_copy(value, &copy) != GETDNS_RETURN_GOOD) {
return GETDNS_RETURN_CONTEXT_UPDATE_FAIL; return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
@ -746,7 +734,7 @@ getdns_return_t
getdns_context_set_dnssec_allowed_skew(struct getdns_context *context, getdns_context_set_dnssec_allowed_skew(struct getdns_context *context,
uint16_t value) uint16_t value)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
set_ub_number_opt(context, "val-sig-skew-min", value); set_ub_number_opt(context, "val-sig-skew-min", value);
set_ub_number_opt(context, "val-sig-skew-max", value); set_ub_number_opt(context, "val-sig-skew-max", value);
dispatch_updated(context, GETDNS_CONTEXT_CODE_DNSSEC_ALLOWED_SKEW); dispatch_updated(context, GETDNS_CONTEXT_CODE_DNSSEC_ALLOWED_SKEW);
@ -764,7 +752,7 @@ getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
{ {
size_t count = 0; size_t count = 0;
size_t i = 0; size_t i = 0;
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
getdns_return_t r = getdns_list_get_length(upstream_list, &count); getdns_return_t r = getdns_list_get_length(upstream_list, &count);
if (count == 0 || r != GETDNS_RETURN_GOOD) { if (count == 0 || r != GETDNS_RETURN_GOOD) {
return GETDNS_RETURN_CONTEXT_UPDATE_FAIL; return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
@ -808,7 +796,7 @@ getdns_return_t
getdns_context_set_edns_maximum_udp_payload_size(struct getdns_context *context, getdns_context_set_edns_maximum_udp_payload_size(struct getdns_context *context,
uint16_t value) uint16_t value)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
/* check for < 512. uint16_t won't let it go above max) */ /* check for < 512. uint16_t won't let it go above max) */
if (value < 512) { if (value < 512) {
return GETDNS_RETURN_CONTEXT_UPDATE_FAIL; return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
@ -830,7 +818,7 @@ getdns_context_set_edns_maximum_udp_payload_size(struct getdns_context *context,
getdns_return_t getdns_return_t
getdns_context_set_edns_extended_rcode(struct getdns_context *context, uint8_t value) getdns_context_set_edns_extended_rcode(struct getdns_context *context, uint8_t value)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
context->edns_extended_rcode = value; context->edns_extended_rcode = value;
dispatch_updated(context, GETDNS_CONTEXT_CODE_EDNS_EXTENDED_RCODE); dispatch_updated(context, GETDNS_CONTEXT_CODE_EDNS_EXTENDED_RCODE);
@ -845,7 +833,7 @@ getdns_context_set_edns_extended_rcode(struct getdns_context *context, uint8_t v
getdns_return_t getdns_return_t
getdns_context_set_edns_version(struct getdns_context *context, uint8_t value) getdns_context_set_edns_version(struct getdns_context *context, uint8_t value)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
context->edns_version = value; context->edns_version = value;
dispatch_updated(context, GETDNS_CONTEXT_CODE_EDNS_VERSION); dispatch_updated(context, GETDNS_CONTEXT_CODE_EDNS_VERSION);
@ -860,7 +848,7 @@ getdns_context_set_edns_version(struct getdns_context *context, uint8_t value)
getdns_return_t getdns_return_t
getdns_context_set_edns_do_bit(struct getdns_context *context, uint8_t value) getdns_context_set_edns_do_bit(struct getdns_context *context, uint8_t value)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
/* 0 or 1 */ /* 0 or 1 */
if (value > 1) { if (value > 1) {
return GETDNS_RETURN_CONTEXT_UPDATE_FAIL; return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
@ -886,7 +874,7 @@ getdns_context_set_extended_memory_functions(
void (*free) (void *userarg, void *) void (*free) (void *userarg, void *)
) )
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
if (!malloc || !realloc || !free) if (!malloc || !realloc || !free)
return GETDNS_RETURN_CONTEXT_UPDATE_FAIL; return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
@ -944,7 +932,7 @@ getdns_context_cancel_request(struct getdns_context *context,
getdns_transaction_t transaction_id, int fire_callback) getdns_transaction_t transaction_id, int fire_callback)
{ {
getdns_dns_req *req = NULL; getdns_dns_req *req = NULL;
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
/* delete the node from the tree */ /* delete the node from the tree */
ldns_rbnode_t *node = ldns_rbtree_delete(context->outbound_requests, ldns_rbnode_t *node = ldns_rbtree_delete(context->outbound_requests,
@ -985,7 +973,7 @@ getdns_return_t
getdns_cancel_callback(struct getdns_context *context, getdns_cancel_callback(struct getdns_context *context,
getdns_transaction_t transaction_id) getdns_transaction_t transaction_id)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
return getdns_context_cancel_request(context, transaction_id, 1); return getdns_context_cancel_request(context, transaction_id, 1);
} /* getdns_cancel_callback */ } /* getdns_cancel_callback */
@ -1063,7 +1051,7 @@ ub_setup_stub(struct ub_ctx *ctx, struct getdns_list * upstreams, size_t count)
getdns_return_t getdns_return_t
getdns_context_prepare_for_resolution(struct getdns_context *context) getdns_context_prepare_for_resolution(struct getdns_context *context)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
if (context->resolution_type_set == context->resolution_type) { if (context->resolution_type_set == context->resolution_type) {
/* already set and no config changes have caused this to be /* already set and no config changes have caused this to be
* bad. * bad.
@ -1188,7 +1176,7 @@ int getdns_context_fd(struct getdns_context* context) {
int int
getdns_context_get_num_pending_requests(struct getdns_context* context, getdns_context_get_num_pending_requests(struct getdns_context* context,
struct timeval* next_timeout) { struct timeval* next_timeout) {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
int r = context->outbound_requests->count; int r = context->outbound_requests->count;
if (r > 0) { if (r > 0) {
if (!context->extension && next_timeout) { if (!context->extension && next_timeout) {
@ -1205,7 +1193,7 @@ getdns_context_get_num_pending_requests(struct getdns_context* context,
/* process async reqs */ /* process async reqs */
getdns_return_t getdns_context_process_async(struct getdns_context* context) { getdns_return_t getdns_context_process_async(struct getdns_context* context) {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
if (ub_poll(context->unbound_ctx)) { if (ub_poll(context->unbound_ctx)) {
if (ub_process(context->unbound_ctx) != 0) { if (ub_process(context->unbound_ctx) != 0) {
/* need an async return code? */ /* need an async return code? */
@ -1278,7 +1266,7 @@ cancel_outstanding_requests(struct getdns_context* context, int fire_callback) {
getdns_return_t getdns_return_t
getdns_extension_detach_eventloop(struct getdns_context* context) getdns_extension_detach_eventloop(struct getdns_context* context)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
getdns_return_t r = GETDNS_RETURN_GOOD; getdns_return_t r = GETDNS_RETURN_GOOD;
if (context->extension) { if (context->extension) {
/* cancel all outstanding requests */ /* cancel all outstanding requests */
@ -1297,7 +1285,7 @@ getdns_return_t
getdns_extension_set_eventloop(struct getdns_context* context, getdns_extension_set_eventloop(struct getdns_context* context,
getdns_eventloop_extension* extension, void* extension_data) getdns_eventloop_extension* extension, void* extension_data)
{ {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
RETURN_IF_NULL(extension, GETDNS_RETURN_INVALID_PARAMETER); RETURN_IF_NULL(extension, GETDNS_RETURN_INVALID_PARAMETER);
getdns_return_t r = getdns_extension_detach_eventloop(context); getdns_return_t r = getdns_extension_detach_eventloop(context);
if (r != GETDNS_RETURN_GOOD) { if (r != GETDNS_RETURN_GOOD) {
@ -1312,7 +1300,7 @@ getdns_return_t
getdns_context_schedule_timeout(struct getdns_context* context, getdns_context_schedule_timeout(struct getdns_context* context,
getdns_transaction_t id, uint16_t timeout, getdns_timeout_callback callback, getdns_transaction_t id, uint16_t timeout, getdns_timeout_callback callback,
void* userarg) { void* userarg) {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
RETURN_IF_NULL(callback, GETDNS_RETURN_INVALID_PARAMETER); RETURN_IF_NULL(callback, GETDNS_RETURN_INVALID_PARAMETER);
getdns_return_t result; getdns_return_t result;
/* create a timeout */ /* create a timeout */
@ -1378,7 +1366,7 @@ getdns_context_schedule_timeout(struct getdns_context* context,
getdns_return_t getdns_return_t
getdns_context_clear_timeout(struct getdns_context* context, getdns_context_clear_timeout(struct getdns_context* context,
getdns_transaction_t id) { getdns_transaction_t id) {
RETURN_IF_NULL(context, GETDNS_RETURN_BAD_CONTEXT); RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
/* find the timeout_data by id */ /* find the timeout_data by id */
ldns_rbnode_t* node = ldns_rbtree_delete(context->timeouts_by_id, &id); ldns_rbnode_t* node = ldns_rbtree_delete(context->timeouts_by_id, &id);
if (!node) { if (!node) {

4
src/general.c
View File

@ -229,7 +229,7 @@ getdns_general_ub(struct getdns_context *context,
gr = getdns_context_prepare_for_resolution(context); gr = getdns_context_prepare_for_resolution(context);
if (gr != GETDNS_RETURN_GOOD) { if (gr != GETDNS_RETURN_GOOD) {
return GETDNS_RETURN_BAD_CONTEXT; return gr;
} }
/* request state */ /* request state */
@ -287,7 +287,7 @@ getdns_general(struct getdns_context *context,
/* Can't do async without an event loop /* Can't do async without an event loop
* or callback * or callback
*/ */
return GETDNS_RETURN_BAD_CONTEXT; return GETDNS_RETURN_INVALID_PARAMETER;
} }
/* ensure callback is not NULL */ /* ensure callback is not NULL */