From 497d87a028289ab569e3c180b73f7b8395db0db6 Mon Sep 17 00:00:00 2001 From: Sara Dickinson Date: Fri, 17 Jun 2016 11:25:21 +0100 Subject: [PATCH] Correct the name to resolution_type --- src/dict.c | 3 +-- src/test/check_getdns_context_set_dns_transport.h | 8 ++++---- src/util-internal.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/dict.c b/src/dict.c index 07d80e51..e7294e62 100644 --- a/src/dict.c +++ b/src/dict.c @@ -1053,8 +1053,7 @@ getdns_pp_dict(gldns_buffer * buf, size_t indent, strcmp(item->node.key, "status") == 0 || strcmp(item->node.key, "append_name") == 0 || strcmp(item->node.key, "follow_redirects") == 0 || - strcmp(item->node.key, "transport") == 0 || - strcmp(item->node.key, "resolution_mode") == 0 || + strcmp(item->node.key, "transport") == 0 || strcmp(item->node.key, "resolution_type") == 0 || strcmp(item->node.key, "tls_authentication") == 0 ) && (strval = diff --git a/src/test/check_getdns_context_set_dns_transport.h b/src/test/check_getdns_context_set_dns_transport.h index af5f7fe6..1985eac6 100644 --- a/src/test/check_getdns_context_set_dns_transport.h +++ b/src/test/check_getdns_context_set_dns_transport.h @@ -158,8 +158,8 @@ ASSERT_RC(getdns_dict_get_int(response, "/call_reporting/0/transport", &transport), GETDNS_RETURN_GOOD, "Failed to extract \"transport\""); ASSERT_RC(transport, GETDNS_TRANSPORT_UDP, "Query did not go over UDP"); - ASSERT_RC(getdns_dict_get_int(response, "/call_reporting/0/resolution_mode", &mode), - GETDNS_RETURN_GOOD, "Failed to extract \"resolution_mode\""); + ASSERT_RC(getdns_dict_get_int(response, "/call_reporting/0/resolution_type", &mode), + GETDNS_RETURN_GOOD, "Failed to extract \"resolution_type\""); ASSERT_RC(mode, GETDNS_RESOLUTION_STUB, "Query did not use stub mode"); ASSERT_RC(getdns_dict_get_int(response, "/replies_tree/0/header/tc", &tc), GETDNS_RETURN_GOOD, "Failed to extract \"tc\""); @@ -253,8 +253,8 @@ ASSERT_RC(getdns_general_sync(context, "getdnsapi.net", 48, extensions, &response), GETDNS_RETURN_GOOD, "Return code from getdns_general_sync()"); - ASSERT_RC(getdns_dict_get_int(response, "/call_reporting/0/resolution_mode", &mode), - GETDNS_RETURN_GOOD, "Failed to extract \"resolution_mode\""); + ASSERT_RC(getdns_dict_get_int(response, "/call_reporting/0/resolution_type", &mode), + GETDNS_RETURN_GOOD, "Failed to extract \"resolution_type\""); ASSERT_RC(mode, GETDNS_RESOLUTION_RECURSING, "Query did not use Recursive mode"); ASSERT_RC(getdns_dict_get_int(response, "/replies_tree/0/header/tc", &tc), GETDNS_RETURN_GOOD, "Failed to extract \"tc\""); diff --git a/src/util-internal.c b/src/util-internal.c index ae3f071b..ca04c7f5 100644 --- a/src/util-internal.c +++ b/src/util-internal.c @@ -813,7 +813,7 @@ _getdns_create_call_reporting_dict( return NULL; } else if (!netreq->upstream) { - if (getdns_dict_set_int( netreq_debug, "resolution_mode", GETDNS_RESOLUTION_RECURSING)) { + if (getdns_dict_set_int( netreq_debug, "resolution_type", GETDNS_RESOLUTION_RECURSING)) { getdns_dict_destroy(netreq_debug); return NULL; } @@ -821,7 +821,7 @@ _getdns_create_call_reporting_dict( return netreq_debug; } - if (getdns_dict_set_int( netreq_debug, "resolution_mode", GETDNS_RESOLUTION_STUB)) { + if (getdns_dict_set_int( netreq_debug, "resolution_type", GETDNS_RESOLUTION_STUB)) { getdns_dict_destroy(netreq_debug); return NULL; }