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

Daemon edns0 handling bugfix

This commit is contained in:
Willem Toorop 2016-07-11 15:43:42 +02:00
parent 7e614bc534
commit b98d91f745
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/convert.c
View File

@ -51,6 +51,7 @@
#include "dict.h" #include "dict.h"
#include "list.h" #include "list.h"
#include "convert.h" #include "convert.h"
#include "debug.h"
/* stuff to make it compile pedantically */ /* stuff to make it compile pedantically */
#define UNUSED_PARAM(x) ((void)(x)) #define UNUSED_PARAM(x) ((void)(x))

14
src/test/getdns_query.c
View File

@ -1239,7 +1239,7 @@ void servfail(dns_msg *msg, getdns_dict **resp_p)
} }
static getdns_return_t _handle_edns0( static getdns_return_t _handle_edns0(
getdns_dict *response, int has_edns0, uint32_t do_bit) getdns_dict *response, int has_edns0)
{ {
getdns_return_t r; getdns_return_t r;
getdns_list *additional; getdns_list *additional;
@ -1249,10 +1249,8 @@ static getdns_return_t _handle_edns0(
char remove_str[100] = "/replies_tree/0/additional/"; char remove_str[100] = "/replies_tree/0/additional/";
if ((r = getdns_dict_set_int( if ((r = getdns_dict_set_int(
response, "/replies_tree/0/header/do", do_bit))) response, "/replies_tree/0/header/do", 0)))
return r; return r;
if (has_edns0)
return GETDNS_RETURN_GOOD;
if ((r = getdns_dict_get_list(response, "/replies_tree/0/additional", if ((r = getdns_dict_get_list(response, "/replies_tree/0/additional",
&additional))) &additional)))
return r; return r;
@ -1265,6 +1263,10 @@ static getdns_return_t _handle_edns0(
return r; return r;
if (rr_type != GETDNS_RRTYPE_OPT) if (rr_type != GETDNS_RRTYPE_OPT)
continue; continue;
if (has_edns0) {
(void) getdns_dict_set_int(rr, "do", 0);
break;
}
(void) snprintf(remove_str + 27, 60, "%d", (int)i); (void) snprintf(remove_str + 27, 60, "%d", (int)i);
if ((r = getdns_dict_remove_name(response, remove_str))) if ((r = getdns_dict_remove_name(response, remove_str)))
return r; return r;
@ -1320,8 +1322,8 @@ static void request_cb(
* bit. In recursing resolution mode we have to copy the do bit from * bit. In recursing resolution mode we have to copy the do bit from
* the request, because libunbound has it in the answer always. * the request, because libunbound has it in the answer always.
*/ */
else if (msg->rt == GETDNS_RESOLUTION_RECURSING && else if (msg->rt == GETDNS_RESOLUTION_RECURSING && !msg->do_bit &&
(r = _handle_edns0(response, msg->has_edns0, msg->do_bit))) (r = _handle_edns0(response, msg->has_edns0)))
SERVFAIL("Could not handle EDNS0", r, msg, &response); SERVFAIL("Could not handle EDNS0", r, msg, &response);
/* AD when (DO or AD) and SECURE */ /* AD when (DO or AD) and SECURE */