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

Fix validate_extensions

This commit is contained in:
Willem Toorop 2013-11-04 23:26:59 -08:00
parent 78cb5480d2
commit 89a7bdcae6
2 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sync.c
View File

@ -65,12 +65,16 @@ getdns_general_sync(
{ {
getdns_return_t response_status; getdns_return_t response_status;
response_status = getdns_general_ub(context->unbound_sync, context->event_base_sync, response_status = validate_extensions(extensions);
context, name, request_type, extensions, if (response_status == GETDNS_RETURN_GOOD) {
(void *)response, NULL, sync_callback_func); response_status = getdns_general_ub(context->unbound_sync,
context->event_base_sync,
context, name, request_type,
extensions, (void *)response,
NULL, sync_callback_func);
event_base_dispatch(context->event_base_sync); event_base_dispatch(context->event_base_sync);
}
return response_status; return response_status;
} }

62
src/util-internal.c
View File

@ -44,18 +44,19 @@
/** /**
* this is a comprehensive list of extensions and their data types * this is a comprehensive list of extensions and their data types
* used by validate_extensions() * used by validate_extensions()
* The list has to be in sorted order for bsearch lookup in function
* validate_extensions.
*/ */
getdns_extension_format extformats[] = { getdns_extension_format extformats[] = {
{"dnssec_return_status", t_int},
{"dnssec_return_only_secure", t_int},
{"dnssec_return_supporting_responses", t_int},
{"return_both_v4_and_v6", t_int},
{"add_opt_parameters", t_dict}, {"add_opt_parameters", t_dict},
{"add_warning_for_bad_dns", t_int}, {"add_warning_for_bad_dns", t_int},
{"specify_class", t_int}, {"dnssec_return_only_secure", t_int},
{"dnssec_return_status", t_int},
{"dnssec_return_supporting_responses", t_int},
{"return_api_information", t_int}, {"return_api_information", t_int},
{"return_both_v4_and_v6", t_int},
{"return_call_debugging", t_int}, {"return_call_debugging", t_int},
{"", t_invalid} {"specify_class", t_int},
}; };
getdns_return_t getdns_dict_util_set_string(getdns_dict* dict, char* name, getdns_return_t getdns_dict_util_set_string(getdns_dict* dict, char* name,
@ -521,41 +522,34 @@ reverse_address(char *addr_str)
return rev_str; return rev_str;
} }
static int extformatcmp(const void *a, const void *b)
{
return strcmp(((getdns_extension_format *)a)->extstring,
((getdns_extension_format *)b)->extstring);
}
/*---------------------------------------- validate_extensions */ /*---------------------------------------- validate_extensions */
getdns_return_t getdns_return_t
validate_extensions(getdns_dict *extensions) validate_extensions(getdns_dict *extensions)
{ {
int retval = GETDNS_RETURN_GOOD; struct getdns_dict_item *item;
int i = 0; getdns_extension_format *extformat;
ldns_rbnode_t *node;
if(extensions == NULL) if(extensions)
return retval; LDNS_RBTREE_FOR(item, struct getdns_dict_item *, &(extensions->root)) {
getdns_extension_format key;
key.extstring = (char *)item->node.key;
extformat = bsearch(&key, extformats,
sizeof(extformats) /
sizeof(getdns_extension_format),
sizeof(getdns_extension_format), extformatcmp);
if (! extformat)
return GETDNS_RETURN_NO_SUCH_EXTENSION;
node = ldns_rbtree_first(&(extensions->root)); if (item->dtype != extformat->exttype)
while(retval == GETDNS_RETURN_GOOD && node != NULL) return GETDNS_RETURN_EXTENSION_MISFORMAT;
{
i = 0;
while(extformats[i].exttype != t_invalid)
{
if(strcmp(extformats[i].extstring, node->key) == 0)
{
if(((struct getdns_dict_item *) node->data)->dtype != extformats[i].exttype)
{
retval = GETDNS_RETURN_EXTENSION_MISFORMAT;
} }
break; return GETDNS_RETURN_GOOD;
}
i++;
}
if(extformats[i].exttype == t_invalid)
retval = GETDNS_RETURN_NO_SUCH_EXTENSION;
else
node = ldns_rbtree_next(node);
} // while retval && node
return retval;
} /* validate_extensions */ } /* validate_extensions */
/* util-internal.c */ /* util-internal.c */