diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..06b16b93
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "src/test/jsmn"]
+	path = src/test/jsmn
+	url = https://github.com/getdnsapi/jsmn.git
+	branch = getdns
diff --git a/configure.ac b/configure.ac
index 63391889..a4713279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,12 +143,14 @@ ACX_ARG_RPATH
 AC_ARG_ENABLE(debug-sched, AC_HELP_STRING([--enable-debug-sched], [Enable scheduling debugging messages]))
 AC_ARG_ENABLE(debug-stub, AC_HELP_STRING([--enable-debug-stub], [Enable stub debugging messages]))
 AC_ARG_ENABLE(debug-sec, AC_HELP_STRING([--enable-debug-sec], [Enable dnssec debugging messages]))
+AC_ARG_ENABLE(debug-trace, AC_HELP_STRING([--enable-debug-trace], [Enable trace debugging of individual dns messages]))
 AC_ARG_ENABLE(all-debugging, AC_HELP_STRING([--enable-all-debugging], [Enable scheduling, stub and dnssec debugging]))
 case "$enable_all_debugging" in
 	yes)
 		enable_debug_sched=yes
 		enable_debug_stub=yes
 		enable_debug_sec=yes
+		enable_debug_trace=yes
 		;;
 	no|*)
 		;;
@@ -174,6 +176,25 @@ case "$enable_debug_sec" in
 	no|*)
 		;;
 esac
+case "$enable_debug_trace" in
+	yes)
+		AC_DEFINE_UNQUOTED([TRACE_DEBUG], [1], [Define this enable printing of transaction ids of individual dns messages.])
+		;;
+	no|*)
+		;;
+esac
+
+
+dnl  Hidden debugging options
+dnl
+AC_ARG_ENABLE(debug-keep-connections-open,[])
+case "$enable_debug_keep_connections_open" in
+	yes)
+		AC_DEFINE_UNQUOTED([KEEP_CONNECTIONS_OPEN_DEBUG], [1], [Do not set this])
+		;;
+	no)
+		;;
+esac
 
 AC_ARG_ENABLE(tcp-fastopen, AC_HELP_STRING([--disable-tcp-fastopen], Disable TCP Fast Open (default=enabled if available)),
     enable_tcp_fastopen="$enableval", enable_tcp_fastopen=yes)
@@ -1005,6 +1026,8 @@ FreeBSD)
 esac
 AC_SUBST(C99COMPATFLAGS)
 
+AC_DEFINE_UNQUOTED([MAX_CNAME_REFERRALS], [100], [The maximum number of cname referrals.])
+
 AH_BOTTOM([
 
 #ifdef GETDNS_ON_WINDOWS
diff --git a/src/const-info.c b/src/const-info.c
index 5a25dd83..9e1b28fc 100644
--- a/src/const-info.c
+++ b/src/const-info.c
@@ -5,6 +5,7 @@
 #include "getdns/getdns.h"
 #include "getdns/getdns_extra.h"
 #include "const-info.h"
+#include <string.h>
 
 static struct const_info consts_info[] = {
 	{   -1, NULL, "/* <unknown getdns value> */" },
@@ -94,6 +95,196 @@ static struct const_info consts_info[] = {
 	{ 1301, "GETDNS_AUTHENTICATION_REQUIRED", GETDNS_AUTHENTICATION_REQUIRED_TEXT },
 };
 
+struct const_name_info { const char *name; int code; };
+static struct const_name_info consts_name_info[] = {
+	{ "GETDNS_APPEND_NAME_ALWAYS", 550 },
+	{ "GETDNS_APPEND_NAME_NEVER", 553 },
+	{ "GETDNS_APPEND_NAME_ONLY_TO_MULTIPLE_LABEL_NAME_AFTER_FAILURE", 552 },
+	{ "GETDNS_APPEND_NAME_ONLY_TO_SINGLE_LABEL_AFTER_FAILURE", 551 },
+	{ "GETDNS_APPEND_NAME_TO_SINGLE_LABEL_FIRST", 554 },
+	{ "GETDNS_AUTHENTICATION_NONE", 1300 },
+	{ "GETDNS_AUTHENTICATION_REQUIRED", 1301 },
+	{ "GETDNS_BAD_DNS_ALL_NUMERIC_LABEL", 1101 },
+	{ "GETDNS_BAD_DNS_CNAME_IN_TARGET", 1100 },
+	{ "GETDNS_BAD_DNS_CNAME_RETURNED_FOR_OTHER_TYPE", 1102 },
+	{ "GETDNS_CALLBACK_CANCEL", 701 },
+	{ "GETDNS_CALLBACK_COMPLETE", 700 },
+	{ "GETDNS_CALLBACK_ERROR", 703 },
+	{ "GETDNS_CALLBACK_TIMEOUT", 702 },
+	{ "GETDNS_CONTEXT_CODE_APPEND_NAME", 607 },
+	{ "GETDNS_CONTEXT_CODE_DNSSEC_ALLOWED_SKEW", 614 },
+	{ "GETDNS_CONTEXT_CODE_DNSSEC_TRUST_ANCHORS", 609 },
+	{ "GETDNS_CONTEXT_CODE_DNS_ROOT_SERVERS", 604 },
+	{ "GETDNS_CONTEXT_CODE_DNS_TRANSPORT", 605 },
+	{ "GETDNS_CONTEXT_CODE_EDNS_CLIENT_SUBNET_PRIVATE", 619 },
+	{ "GETDNS_CONTEXT_CODE_EDNS_DO_BIT", 613 },
+	{ "GETDNS_CONTEXT_CODE_EDNS_EXTENDED_RCODE", 611 },
+	{ "GETDNS_CONTEXT_CODE_EDNS_MAXIMUM_UDP_PAYLOAD_SIZE", 610 },
+	{ "GETDNS_CONTEXT_CODE_EDNS_VERSION", 612 },
+	{ "GETDNS_CONTEXT_CODE_FOLLOW_REDIRECTS", 602 },
+	{ "GETDNS_CONTEXT_CODE_IDLE_TIMEOUT", 617 },
+	{ "GETDNS_CONTEXT_CODE_LIMIT_OUTSTANDING_QUERIES", 606 },
+	{ "GETDNS_CONTEXT_CODE_MEMORY_FUNCTIONS", 615 },
+	{ "GETDNS_CONTEXT_CODE_NAMESPACES", 600 },
+	{ "GETDNS_CONTEXT_CODE_PUBKEY_PINSET", 621 },
+	{ "GETDNS_CONTEXT_CODE_RESOLUTION_TYPE", 601 },
+	{ "GETDNS_CONTEXT_CODE_SUFFIX", 608 },
+	{ "GETDNS_CONTEXT_CODE_TIMEOUT", 616 },
+	{ "GETDNS_CONTEXT_CODE_TLS_AUTHENTICATION", 618 },
+	{ "GETDNS_CONTEXT_CODE_TLS_QUERY_PADDING_BLOCKSIZE", 620 },
+	{ "GETDNS_CONTEXT_CODE_UPSTREAM_RECURSIVE_SERVERS", 603 },
+	{ "GETDNS_DNSSEC_BOGUS", 401 },
+	{ "GETDNS_DNSSEC_INDETERMINATE", 402 },
+	{ "GETDNS_DNSSEC_INSECURE", 403 },
+	{ "GETDNS_DNSSEC_NOT_PERFORMED", 404 },
+	{ "GETDNS_DNSSEC_SECURE", 400 },
+	{ "GETDNS_EXTENSION_FALSE", 1001 },
+	{ "GETDNS_EXTENSION_TRUE", 1000 },
+	{ "GETDNS_NAMESPACE_DNS", 500 },
+	{ "GETDNS_NAMESPACE_LOCALNAMES", 501 },
+	{ "GETDNS_NAMESPACE_MDNS", 503 },
+	{ "GETDNS_NAMESPACE_NETBIOS", 502 },
+	{ "GETDNS_NAMESPACE_NIS", 504 },
+	{ "GETDNS_NAMETYPE_DNS", 800 },
+	{ "GETDNS_NAMETYPE_WINS", 801 },
+	{ "GETDNS_OPCODE_IQUERY", 1 },
+	{ "GETDNS_OPCODE_NOTIFY", 4 },
+	{ "GETDNS_OPCODE_QUERY", 0 },
+	{ "GETDNS_OPCODE_STATUS", 2 },
+	{ "GETDNS_OPCODE_UPDATE", 5 },
+	{ "GETDNS_RCODE_BADALG", 21 },
+	{ "GETDNS_RCODE_BADKEY", 17 },
+	{ "GETDNS_RCODE_BADMODE", 19 },
+	{ "GETDNS_RCODE_BADNAME", 20 },
+	{ "GETDNS_RCODE_BADSIG", 16 },
+	{ "GETDNS_RCODE_BADTIME", 18 },
+	{ "GETDNS_RCODE_BADTRUNC", 22 },
+	{ "GETDNS_RCODE_BADVERS", 16 },
+	{ "GETDNS_RCODE_FORMERR", 1 },
+	{ "GETDNS_RCODE_NOERROR", 0 },
+	{ "GETDNS_RCODE_NOTAUTH", 9 },
+	{ "GETDNS_RCODE_NOTIMP", 4 },
+	{ "GETDNS_RCODE_NOTZONE", 10 },
+	{ "GETDNS_RCODE_NXDOMAIN", 3 },
+	{ "GETDNS_RCODE_NXRRSET", 8 },
+	{ "GETDNS_RCODE_REFUSED", 5 },
+	{ "GETDNS_RCODE_SERVFAIL", 2 },
+	{ "GETDNS_RCODE_YXDOMAIN", 6 },
+	{ "GETDNS_RCODE_YXRRSET", 7 },
+	{ "GETDNS_REDIRECTS_DO_NOT_FOLLOW", 531 },
+	{ "GETDNS_REDIRECTS_FOLLOW", 530 },
+	{ "GETDNS_RESOLUTION_RECURSING", 521 },
+	{ "GETDNS_RESOLUTION_STUB", 520 },
+	{ "GETDNS_RESPSTATUS_ALL_BOGUS_ANSWERS", 904 },
+	{ "GETDNS_RESPSTATUS_ALL_TIMEOUT", 902 },
+	{ "GETDNS_RESPSTATUS_GOOD", 900 },
+	{ "GETDNS_RESPSTATUS_NO_NAME", 901 },
+	{ "GETDNS_RESPSTATUS_NO_SECURE_ANSWERS", 903 },
+	{ "GETDNS_RETURN_BAD_CONTEXT", 301 },
+	{ "GETDNS_RETURN_BAD_DOMAIN_NAME", 300 },
+	{ "GETDNS_RETURN_CONTEXT_UPDATE_FAIL", 302 },
+	{ "GETDNS_RETURN_DNSSEC_WITH_STUB_DISALLOWED", 309 },
+	{ "GETDNS_RETURN_EXTENSION_MISFORMAT", 308 },
+	{ "GETDNS_RETURN_GENERIC_ERROR", 1 },
+	{ "GETDNS_RETURN_GOOD", 0 },
+	{ "GETDNS_RETURN_INVALID_PARAMETER", 311 },
+	{ "GETDNS_RETURN_MEMORY_ERROR", 310 },
+	{ "GETDNS_RETURN_NEED_MORE_SPACE", 399 },
+	{ "GETDNS_RETURN_NOT_IMPLEMENTED", 312 },
+	{ "GETDNS_RETURN_NO_SUCH_DICT_NAME", 305 },
+	{ "GETDNS_RETURN_NO_SUCH_EXTENSION", 307 },
+	{ "GETDNS_RETURN_NO_SUCH_LIST_ITEM", 304 },
+	{ "GETDNS_RETURN_UNKNOWN_TRANSACTION", 303 },
+	{ "GETDNS_RETURN_WRONG_TYPE_REQUESTED", 306 },
+	{ "GETDNS_RRCLASS_ANY", 255 },
+	{ "GETDNS_RRCLASS_CH", 3 },
+	{ "GETDNS_RRCLASS_HS", 4 },
+	{ "GETDNS_RRCLASS_IN", 1 },
+	{ "GETDNS_RRCLASS_NONE", 254 },
+	{ "GETDNS_RRTYPE_A", 1 },
+	{ "GETDNS_RRTYPE_AAAA", 28 },
+	{ "GETDNS_RRTYPE_AFSDB", 18 },
+	{ "GETDNS_RRTYPE_ANY", 255 },
+	{ "GETDNS_RRTYPE_APL", 42 },
+	{ "GETDNS_RRTYPE_ATMA", 34 },
+	{ "GETDNS_RRTYPE_AXFR", 252 },
+	{ "GETDNS_RRTYPE_CAA", 257 },
+	{ "GETDNS_RRTYPE_CDNSKEY", 60 },
+	{ "GETDNS_RRTYPE_CDS", 59 },
+	{ "GETDNS_RRTYPE_CERT", 37 },
+	{ "GETDNS_RRTYPE_CNAME", 5 },
+	{ "GETDNS_RRTYPE_CSYNC", 62 },
+	{ "GETDNS_RRTYPE_DHCID", 49 },
+	{ "GETDNS_RRTYPE_DLV", 32769 },
+	{ "GETDNS_RRTYPE_DNAME", 39 },
+	{ "GETDNS_RRTYPE_DNSKEY", 48 },
+	{ "GETDNS_RRTYPE_DS", 43 },
+	{ "GETDNS_RRTYPE_EID", 31 },
+	{ "GETDNS_RRTYPE_GID", 102 },
+	{ "GETDNS_RRTYPE_GPOS", 27 },
+	{ "GETDNS_RRTYPE_HINFO", 13 },
+	{ "GETDNS_RRTYPE_HIP", 55 },
+	{ "GETDNS_RRTYPE_IPSECKEY", 45 },
+	{ "GETDNS_RRTYPE_ISDN", 20 },
+	{ "GETDNS_RRTYPE_IXFR", 251 },
+	{ "GETDNS_RRTYPE_KEY", 25 },
+	{ "GETDNS_RRTYPE_KX", 36 },
+	{ "GETDNS_RRTYPE_LOC", 29 },
+	{ "GETDNS_RRTYPE_LP", 107 },
+	{ "GETDNS_RRTYPE_MAILA", 254 },
+	{ "GETDNS_RRTYPE_MAILB", 253 },
+	{ "GETDNS_RRTYPE_MB", 7 },
+	{ "GETDNS_RRTYPE_MD", 3 },
+	{ "GETDNS_RRTYPE_MF", 4 },
+	{ "GETDNS_RRTYPE_MG", 8 },
+	{ "GETDNS_RRTYPE_MINFO", 14 },
+	{ "GETDNS_RRTYPE_MR", 9 },
+	{ "GETDNS_RRTYPE_MX", 15 },
+	{ "GETDNS_RRTYPE_NAPTR", 35 },
+	{ "GETDNS_RRTYPE_NID", 104 },
+	{ "GETDNS_RRTYPE_NIMLOC", 32 },
+	{ "GETDNS_RRTYPE_NINFO", 56 },
+	{ "GETDNS_RRTYPE_NS", 2 },
+	{ "GETDNS_RRTYPE_NSAP", 22 },
+	{ "GETDNS_RRTYPE_NSEC", 47 },
+	{ "GETDNS_RRTYPE_NULL", 10 },
+	{ "GETDNS_RRTYPE_NXT", 30 },
+	{ "GETDNS_RRTYPE_OPENPGPKEY", 61 },
+	{ "GETDNS_RRTYPE_OPT", 41 },
+	{ "GETDNS_RRTYPE_PTR", 12 },
+	{ "GETDNS_RRTYPE_PX", 26 },
+	{ "GETDNS_RRTYPE_RKEY", 57 },
+	{ "GETDNS_RRTYPE_RP", 17 },
+	{ "GETDNS_RRTYPE_RRSIG", 46 },
+	{ "GETDNS_RRTYPE_RT", 21 },
+	{ "GETDNS_RRTYPE_SIG", 24 },
+	{ "GETDNS_RRTYPE_SINK", 40 },
+	{ "GETDNS_RRTYPE_SOA", 6 },
+	{ "GETDNS_RRTYPE_SPF", 99 },
+	{ "GETDNS_RRTYPE_SRV", 33 },
+	{ "GETDNS_RRTYPE_SSHFP", 44 },
+	{ "GETDNS_RRTYPE_TA", 32768 },
+	{ "GETDNS_RRTYPE_TALINK", 58 },
+	{ "GETDNS_RRTYPE_TKEY", 249 },
+	{ "GETDNS_RRTYPE_TLSA", 52 },
+	{ "GETDNS_RRTYPE_TSIG", 250 },
+	{ "GETDNS_RRTYPE_TXT", 16 },
+	{ "GETDNS_RRTYPE_UID", 101 },
+	{ "GETDNS_RRTYPE_UINFO", 100 },
+	{ "GETDNS_RRTYPE_UNSPEC", 103 },
+	{ "GETDNS_RRTYPE_URI", 256 },
+	{ "GETDNS_RRTYPE_WKS", 11 },
+	{ "GETDNS_TRANSPORT_TCP", 1201 },
+	{ "GETDNS_TRANSPORT_TCP_ONLY", 542 },
+	{ "GETDNS_TRANSPORT_TCP_ONLY_KEEP_CONNECTIONS_OPEN", 543 },
+	{ "GETDNS_TRANSPORT_TLS", 1202 },
+	{ "GETDNS_TRANSPORT_TLS_FIRST_AND_FALL_BACK_TO_TCP_KEEP_CONNECTIONS_OPEN", 545 },
+	{ "GETDNS_TRANSPORT_TLS_ONLY_KEEP_CONNECTIONS_OPEN", 544 },
+	{ "GETDNS_TRANSPORT_UDP", 1200 },
+	{ "GETDNS_TRANSPORT_UDP_FIRST_AND_FALL_BACK_TO_TCP", 540 },
+	{ "GETDNS_TRANSPORT_UDP_ONLY", 541 },
+};
+
 static int const_info_cmp(const void *a, const void *b)
 {
 	return ((struct const_info *) a)->code - ((struct const_info *) b)->code;
@@ -110,6 +301,25 @@ _getdns_get_const_info(int value)
 	return consts_info;
 }
 
+static int const_name_info_cmp(const void *a, const void *b)
+{
+	return strcmp( ((struct const_name_info *) a)->name
+	             , ((struct const_name_info *) b)->name );
+}
+int
+_getdns_get_const_name_info(const char *name, int *code)
+{
+	struct const_name_info key = { name, 0 };
+	struct const_name_info *i = bsearch(&key, consts_name_info,
+	    sizeof(consts_name_info) / sizeof(struct const_name_info),
+	    sizeof(struct const_name_info), const_name_info_cmp);
+	if (!i)
+		return 0;
+	if (code)
+		*code = i->code;
+	return 1;
+}
+
 const char *
 getdns_get_errorstr_by_id(uint16_t err)
 {
diff --git a/src/const-info.h b/src/const-info.h
index 39d7c98e..f41a1c52 100644
--- a/src/const-info.h
+++ b/src/const-info.h
@@ -46,6 +46,7 @@ struct const_info {
 };
 
 struct const_info *_getdns_get_const_info(int value);
+int _getdns_get_const_name_info(const char *name, int *code);
 
 #endif
 
diff --git a/src/context.c b/src/context.c
index cbbcbab0..5acba6cf 100644
--- a/src/context.c
+++ b/src/context.c
@@ -1951,7 +1951,7 @@ getdns_context_set_follow_redirects(
 
 	dispatch_updated(context, GETDNS_CONTEXT_CODE_FOLLOW_REDIRECTS);
 
-	return GETDNS_RETURN_NOT_IMPLEMENTED;
+	return GETDNS_RETURN_GOOD;
 }               /* getdns_context_set_follow_redirects */
 
 /*
@@ -1971,7 +1971,7 @@ getdns_context_set_dns_root_servers(
 #  endif
 	size_t i;
 	getdns_dict *rr_dict;
-	getdns_return_t r;
+	getdns_return_t r = GETDNS_RETURN_GOOD;
 	getdns_bindata *addr_bd;
 	char dst[2048];
 #endif
@@ -2002,19 +2002,28 @@ getdns_context_set_dns_root_servers(
 
 #ifdef HAVE_LIBUNBOUND
 #  ifdef HAVE_UB_CTX_SET_STUB
-	for (i=0; (!(r = getdns_list_get_dict(addresses, i, &rr_dict))); i++) {
-		if (getdns_dict_get_bindata(
+	for (i=0; !r; i++) {
+		if (!(r = getdns_list_get_bindata(addresses, i, &addr_bd)))
+			/* success! */
+			;
+
+		else if ((r = getdns_list_get_dict(addresses, i, &rr_dict)))
+			/* Not a bindata, not a dict? ERROR! */
+			break;
+
+		else if (getdns_dict_get_bindata(
 		    rr_dict, "address_data", &addr_bd) &&
 		    getdns_dict_get_bindata(
 		    rr_dict, "/rdata/ipv4_address", &addr_bd) &&
 		    getdns_dict_get_bindata(
 		    rr_dict, "/rdata/ipv6_address", &addr_bd))
 
-			; /* Not a parsable address,
-			   * pass because we allow root.hint's files as input
-			   */
+		       	/* Not a parsable address,
+			 * pass because we allow root.hint's files as input
+			 */
+			continue;
 
-		else if (addr_bd->size == 16 &&
+		if (addr_bd->size == 16 &&
 		    inet_ntop(AF_INET6, addr_bd->data, dst, sizeof(dst))) {
 
 			if (ub_ctx_set_stub(context->unbound_ctx,".",dst,1)) {
@@ -2034,22 +2043,34 @@ getdns_context_set_dns_root_servers(
 
 	if (!(fh = fdopen(fd, "w")))
 		return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
-	for (i=0; (!(r = getdns_list_get_dict(addresses, i, &rr_dict))); i++) {
+	for (i=0; !r; i++) {
 		dst_len = sizeof(dst);
-		if (!getdns_rr_dict2str_buf(rr_dict, dst, &dst_len))
+		if (!(r = getdns_list_get_bindata(addresses, i, &addr_bd)))
+			/* success! */
+			;
+
+		else if ((r = getdns_list_get_dict(addresses, i, &rr_dict)))
+			/* Not a bindata, not a dict? ERROR! */
+			break;
+
+		else if (!getdns_rr_dict2str_buf(rr_dict, dst, &dst_len)) {
 
 			fprintf(fh, "%s", dst);
+			continue;
 
-		else if (getdns_dict_get_bindata(
+		} else if (getdns_dict_get_bindata(
 		    rr_dict, "address_data", &addr_bd) &&
 		    getdns_dict_get_bindata(
 		    rr_dict, "/rdata/ipv4_address", &addr_bd) &&
 		    getdns_dict_get_bindata(
 		    rr_dict, "/rdata/ipv6_address", &addr_bd))
 
-			; /* pass */
+		       	/* Not a parsable address,
+			 * pass because we allow root.hint's files as input
+			 */
+			continue;
 
-		else if (addr_bd->size == 16 &&
+		if (addr_bd->size == 16 &&
 		    inet_ntop(AF_INET6, addr_bd->data, dst, sizeof(dst)))
 
 			fprintf(fh,". NS "PRIsz".root-servers.getdnsapi.net.\n"
@@ -2096,22 +2117,23 @@ getdns_context_set_dns_root_servers(
  *
  */
 getdns_return_t
-getdns_context_set_append_name(struct getdns_context *context,
-    getdns_append_name_t value)
+getdns_context_set_append_name(
+    getdns_context *context, getdns_append_name_t value)
 {
-    RETURN_IF_NULL(context, GETDNS_RETURN_INVALID_PARAMETER);
-    if (value != GETDNS_APPEND_NAME_ALWAYS &&
-        value != GETDNS_APPEND_NAME_ONLY_TO_SINGLE_LABEL_AFTER_FAILURE &&
-        value != GETDNS_APPEND_NAME_ONLY_TO_MULTIPLE_LABEL_NAME_AFTER_FAILURE
-        && value != GETDNS_APPEND_NAME_NEVER) {
-        return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
-    }
+	if (!context)
+		return GETDNS_RETURN_INVALID_PARAMETER;
 
-    context->append_name = value;
-
-    dispatch_updated(context, GETDNS_CONTEXT_CODE_APPEND_NAME);
-
-    return GETDNS_RETURN_GOOD;
+	switch ((int)value) {
+	case GETDNS_APPEND_NAME_ALWAYS:
+	case GETDNS_APPEND_NAME_ONLY_TO_SINGLE_LABEL_AFTER_FAILURE:
+	case GETDNS_APPEND_NAME_ONLY_TO_MULTIPLE_LABEL_NAME_AFTER_FAILURE:
+	case GETDNS_APPEND_NAME_NEVER:
+	case GETDNS_APPEND_NAME_TO_SINGLE_LABEL_FIRST:
+		context->append_name = value;
+		dispatch_updated(context, GETDNS_CONTEXT_CODE_APPEND_NAME);
+		return GETDNS_RETURN_GOOD;
+	}
+	return GETDNS_RETURN_CONTEXT_UPDATE_FAIL;
 }               /* getdns_context_set_append_name */
 
 /*
@@ -2304,34 +2326,56 @@ getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
 		uint8_t          tsig_dname_spc[256], *tsig_dname;
 		size_t           tsig_dname_len;
 
-		if ((r = getdns_list_get_dict(upstream_list, i, &dict)))
-			goto error;
+		if ((r = getdns_list_get_dict(upstream_list, i, &dict))) {
+			dict = NULL;
 
-		if ((r = getdns_dict_get_bindata(
-		    dict, "address_type",&address_type)))
-			goto error;
-		if (address_type->size < 4)
-			goto invalid_parameter;
-		if (strncmp((char *)address_type->data, "IPv4", 4) == 0)
-			addr.ss_family = AF_INET;
-		else if (strncmp((char *)address_type->data, "IPv6", 4) == 0)
-			addr.ss_family = AF_INET6;
-		else	goto invalid_parameter;
+			if ((r = getdns_list_get_bindata(
+			    upstream_list, i, &address_data)))
+				goto error;
 
-		if ((r = getdns_dict_get_bindata(
-		    dict, "address_data", &address_data)))
-			goto error;
-		if ((addr.ss_family == AF_INET &&
-		     address_data->size != 4) ||
-		    (addr.ss_family == AF_INET6 &&
-		     address_data->size != 16))
-			goto invalid_parameter;
+			if (address_data->size == 4)
+				addr.ss_family = AF_INET;
+			else if (address_data->size == 16)
+				addr.ss_family = AF_INET6;
+			else	goto invalid_parameter;
+
+		} else if ((r = getdns_dict_get_bindata(
+		    dict, "address_type",&address_type))) {
+			/* Just address_data is also okay */
+			if ((r = getdns_dict_get_bindata(
+			    dict, "address_data", &address_data)))
+				goto error;
+
+			if (address_data->size == 4)
+				addr.ss_family = AF_INET;
+			else if (address_data->size == 16)
+				addr.ss_family = AF_INET6;
+			else	goto invalid_parameter;
+
+		} else {
+			if (address_type->size < 4)
+				goto invalid_parameter;
+			else if (!strncmp((char*)address_type->data,"IPv4",4))
+				addr.ss_family = AF_INET;
+			else if (!strncmp((char*)address_type->data,"IPv6",4))
+				addr.ss_family = AF_INET6;
+			else	goto invalid_parameter;
+
+			if ((r = getdns_dict_get_bindata(
+			    dict, "address_data", &address_data)))
+				goto error;
+			if ((addr.ss_family == AF_INET &&
+			     address_data->size != 4) ||
+			    (addr.ss_family == AF_INET6 &&
+			     address_data->size != 16))
+				goto invalid_parameter;
+		}
 		if (inet_ntop(addr.ss_family, address_data->data,
 		    addrstr, 1024) == NULL)
 			goto invalid_parameter;
 
-		if (getdns_dict_get_bindata(dict, "scope_id", &scope_id) ==
-		    GETDNS_RETURN_GOOD) {
+		if (dict && getdns_dict_get_bindata(dict,"scope_id",&scope_id)
+		    == GETDNS_RETURN_GOOD) {
 			if (strlen(addrstr) + scope_id->size > 1022)
 				goto invalid_parameter;
 			eos = &addrstr[strlen(addrstr)];
@@ -2344,13 +2388,17 @@ getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
 		tsig_dname = NULL;
 		tsig_dname_len = 0;
 
-		if (getdns_dict_get_bindata(dict,
+		if (dict && getdns_dict_get_bindata(dict,
 		    "tsig_algorithm", &tsig_alg_name) == GETDNS_RETURN_GOOD)
 			tsig_alg = _getdns_get_tsig_algo(tsig_alg_name);
 		else
 			tsig_alg = GETDNS_HMAC_MD5;
 
-		if (getdns_dict_get_bindata(dict, "tsig_name", &tsig_name))
+		if (!dict)
+			tsig_alg = GETDNS_NO_TSIG; /* No name, no TSIG */
+
+		else if (getdns_dict_get_bindata(
+		    dict, "tsig_name", &tsig_name))
 			tsig_alg = GETDNS_NO_TSIG; /* No name, no TSIG */
 
 		else if (tsig_name->size == 0)
@@ -2390,7 +2438,8 @@ getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
 			                                  , tsig_name->size);
 			tsig_dname_len = tsig_name->size;
 		}
-		if (getdns_dict_get_bindata(dict, "tsig_secret", &tsig_key))
+		if (dict && getdns_dict_get_bindata(
+		    dict, "tsig_secret", &tsig_key))
 			tsig_alg = GETDNS_NO_TSIG; /* No key, no TSIG */
 
 		/* Don't check TSIG length contraints here.
@@ -2405,10 +2454,13 @@ getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
 			if (port == GETDNS_PORT_ZERO)
 				continue;
 
-			if (getdns_upstream_transports[j] != GETDNS_TRANSPORT_TLS)
-				(void) getdns_dict_get_int(dict, "port", &port);
-			else
-				(void) getdns_dict_get_int(dict, "tls_port", &port);
+			if (getdns_upstream_transports[j] != GETDNS_TRANSPORT_TLS) {
+				if (dict)
+					(void) getdns_dict_get_int(dict, "port", &port);
+			} else {
+				if (dict)
+					(void) getdns_dict_get_int(dict, "tls_port", &port);
+			}
 			(void) snprintf(portstr, 1024, "%d", (int)port);
 
 			if (getaddrinfo(addrstr, portstr, &hints, &ai))
@@ -2426,7 +2478,7 @@ getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
 			upstream->transport = getdns_upstream_transports[j];
 			if (getdns_upstream_transports[j] == GETDNS_TRANSPORT_TLS) {
 				getdns_list *pubkey_pinset = NULL;
-				if ((r = getdns_dict_get_bindata(
+				if (dict && (r = getdns_dict_get_bindata(
 					dict, "tls_auth_name", &tls_auth_name)) == GETDNS_RETURN_GOOD) {
 					/*TODO: VALIDATE THIS STRING!*/
 					memcpy(upstream->tls_auth_name,
@@ -2434,7 +2486,7 @@ getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
 						tls_auth_name->size);
 					upstream->tls_auth_name[tls_auth_name->size] = '\0';
 				}
-				if ((r = getdns_dict_get_list(dict, "tls_pubkey_pinset",
+				if (dict && (r = getdns_dict_get_list(dict, "tls_pubkey_pinset",
 							      &pubkey_pinset)) == GETDNS_RETURN_GOOD) {
 			   /* TODO: what if the user supplies tls_pubkey_pinset with
 			    * something other than a list? */
diff --git a/src/debug.h b/src/debug.h
index a06c95cb..222fbf2d 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -95,5 +95,12 @@
 #define DEBUG_SEC(...) DEBUG_OFF(__VA_ARGS__)
 #endif
 
+#if defined(TRACE_DEBUG) && TRACE_DEBUG
+#include <time.h>
+#define DEBUG_TRACE(...) DEBUG_ON(__VA_ARGS__)
+#else
+#define DEBUG_TRACE(...) DEBUG_OFF(__VA_ARGS__)
+#endif
+
 #endif
 /* debug.h */
diff --git a/src/dict.c b/src/dict.c
index 910e0d28..8e7eec8f 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -280,8 +280,7 @@ getdns_dict_get_names(const getdns_dict *dict, getdns_list **answer)
 
 	RBTREE_FOR(item, struct getdns_dict_item *,
 		(_getdns_rbtree_t *)&(dict->root)) {
-		_getdns_list_append_const_bindata(*answer,
-		    strlen(item->node.key) + 1, item->node.key);
+		_getdns_list_append_string(*answer, item->node.key);
 	}
 	return GETDNS_RETURN_GOOD;
 }				/* getdns_dict_get_names */
@@ -657,9 +656,26 @@ getdns_dict_set_bindata(
 getdns_return_t
 getdns_dict_util_set_string(getdns_dict *dict, char *name, const char *value)
 {
-	return value
-	    ? _getdns_dict_set_const_bindata(dict, name, strlen(value), value)
-	    : GETDNS_RETURN_INVALID_PARAMETER;
+	getdns_item    *item;
+	getdns_bindata *newbindata;
+	getdns_return_t r;
+
+	if (!dict || !name || !value)
+		return GETDNS_RETURN_INVALID_PARAMETER;
+
+	if (!(newbindata = _getdns_bindata_copy(
+	    &dict->mf, strlen(value) + 1, (uint8_t *)value)))
+		return GETDNS_RETURN_MEMORY_ERROR;
+
+	newbindata->size -= 1;
+
+	if ((r = _getdns_dict_find_and_add(dict, name, &item))) {
+		_getdns_bindata_destroy(&dict->mf, newbindata);
+		return r;
+	}
+	item->dtype = t_bindata;
+	item->data.bindata = newbindata;
+	return GETDNS_RETURN_GOOD;
 }				/* getdns_dict_util_set_dict */
 
 /*---------------------------------------- getdns_dict_set_int */
@@ -766,7 +782,7 @@ getdns_pp_bindata(gldns_buffer *buf, size_t indent,
 		(void)gldns_wire2str_dname_buf(
 		    bindata->data, bindata->size, spc, sizeof(spc));
 		if (gldns_buffer_printf(
-		    buf, (json ? "\"%s\"" : "of \"%s\">"), spc) < 0)
+		    buf, (json ? "\"%s\"" : "for %s>"), spc) < 0)
 			return -1;
 	} else if (json) {
 		if (gldns_buffer_printf(buf, "[") < 0)
diff --git a/src/dnssec.c b/src/dnssec.c
index 7c851aba..e3a8a65d 100644
--- a/src/dnssec.c
+++ b/src/dnssec.c
@@ -210,9 +210,6 @@
 #include "list.h"
 #include "util/val_secalgo.h"
 
- /* Maximum number of canonical name redirections for one name */
-#define MAX_CNAMES 100
-
 #define SIGNATURE_VERIFIED         0x10000
 #define NSEC3_ITERATION_COUNT_HIGH 0x20000
 #define NO_SUPPORTED_ALGORITHMS    0x40000
@@ -1069,7 +1066,7 @@ static void add_question2val_chain(struct mem_funcs *mf,
 	q_rrset.pkt      = pkt;
 	q_rrset.pkt_len  = pkt_len;
 
-	for (anti_loop = MAX_CNAMES; anti_loop; anti_loop--) {
+	for (anti_loop = MAX_CNAME_REFERRALS; anti_loop; anti_loop--) {
 		if (!(rr = rrtype_iter_init(&rr_spc, &q_rrset)))
 			break;
 		if (!(rdf = _getdns_rdf_iter_init(&rdf_spc, &rr->rr_i)))
diff --git a/src/general.c b/src/general.c
index 1119106d..8e29fb58 100644
--- a/src/general.c
+++ b/src/general.c
@@ -84,7 +84,7 @@ static int
 no_answer(getdns_dns_req *dns_req)
 {
 	getdns_network_req **netreq_p, *netreq;
-	int new_canonical = 0;
+	int new_canonical = 0, cnames_followed;
 	uint8_t canon_spc[256];
 	const uint8_t *canon;
 	size_t canon_len;
@@ -103,7 +103,7 @@ no_answer(getdns_dns_req *dns_req)
 		canon_len = netreq->owner->name_len;
 		if (netreq->request_type != GETDNS_RRTYPE_CNAME
 		    && GLDNS_ANCOUNT(netreq->response) > 1) do {
-			new_canonical = 0;
+			new_canonical = 0, cnames_followed = 0;
 			for ( rr = _getdns_rr_iter_init(&rr_spc
 			                               , netreq->response
 			                               , netreq->response_len)
@@ -131,8 +131,9 @@ no_answer(getdns_dns_req *dns_req)
 				canon = _getdns_rdf_if_or_as_decompressed(
 				    rdf, canon_spc, &canon_len);
 				new_canonical = 1;
+				cnames_followed++;
 			}
-		} while (new_canonical);
+		} while (new_canonical && cnames_followed<MAX_CNAME_REFERRALS);
 		for ( rr = _getdns_rr_iter_init(&rr_spc
 					       , netreq->response
 					       , netreq->response_len)
diff --git a/src/libgetdns.symbols b/src/libgetdns.symbols
index 71564132..4bab9617 100644
--- a/src/libgetdns.symbols
+++ b/src/libgetdns.symbols
@@ -145,3 +145,4 @@ getdns_wire2rr_dict_buf
 getdns_wire2rr_dict_scan
 plain_mem_funcs_user_arg
 priv_getdns_context_mf
+_getdns_get_const_name_info
diff --git a/src/list.c b/src/list.c
index 52cccde2..eec2a1c1 100644
--- a/src/list.c
+++ b/src/list.c
@@ -602,9 +602,25 @@ getdns_list_set_bindata(
 static getdns_return_t
 getdns_list_set_string(getdns_list *list, size_t index, const char *value)
 {
-	return value
-	    ? _getdns_list_set_const_bindata(list, index, strlen(value), value)
-	    : GETDNS_RETURN_INVALID_PARAMETER;
+	getdns_bindata *newbindata;
+	getdns_return_t r;
+
+	if (!list || !value)
+		return GETDNS_RETURN_INVALID_PARAMETER;
+
+	if (!(newbindata = _getdns_bindata_copy(
+	    &list->mf, strlen(value) + 1, (uint8_t *)value)))
+		return GETDNS_RETURN_MEMORY_ERROR;
+
+	newbindata->size -= 1;
+
+	if ((r = _getdns_list_request_index(list, index))) {
+		_getdns_bindata_destroy(&list->mf, newbindata);
+		return r;
+	}
+	list->items[index].dtype = t_bindata;
+	list->items[index].data.bindata = newbindata;
+	return GETDNS_RETURN_GOOD;
 }				/* getdns_list_set_string */
 
 /*---------------------------------------- getdns_list_set_int */
diff --git a/src/mk-const-info.c.sh b/src/mk-const-info.c.sh
index 631b89c6..a53de949 100755
--- a/src/mk-const-info.c.sh
+++ b/src/mk-const-info.c.sh
@@ -8,11 +8,19 @@ cat > const-info.c << END_OF_HEAD
 #include "getdns/getdns.h"
 #include "getdns/getdns_extra.h"
 #include "const-info.h"
+#include <string.h>
 
 static struct const_info consts_info[] = {
 	{   -1, NULL, "/* <unknown getdns value> */" },
 END_OF_HEAD
 gawk '/^[ 	]+GETDNS_[A-Z_]+[ 	]+=[ 	]+[0-9]+/{ key = sprintf("%4d", $3); consts[key] = $1; }/^#define GETDNS_[A-Z_]+[ 	]+[0-9]+/ && !/^#define GETDNS_RRTYPE/ && !/^#define GETDNS_RRCLASS/ && !/^#define GETDNS_OPCODE/  && !/^#define GETDNS_RCODE/ && !/_TEXT/{ key = sprintf("%4d", $3); consts[key] = $2; }/^#define GETDNS_[A-Z_]+[ 	]+\(\(getdns_(return|append_name)_t) [0-9]+ \)/{ key = sprintf("%4d", $4); consts[key] = $2; }END{ n = asorti(consts, const_vals); for ( i = 1; i <= n; i++) { val = const_vals[i]; name = consts[val]; print "\t{ "val", \""name"\", "name"_TEXT },"}}' getdns/getdns.h.in getdns/getdns_extra.h.in | sed 's/,,/,/g' >> const-info.c
+cat >> const-info.c << END_OF_MIDDLE
+};
+
+struct const_name_info { const char *name; int code; };
+static struct const_name_info consts_name_info[] = {
+END_OF_MIDDLE
+gawk '/^[ 	]+GETDNS_[A-Z_]+[ 	]+=[ 	]+[0-9]+/{ key = sprintf("%d", $3); consts[$1] = key; }/^#define GETDNS_[A-Z_]+[ 	]+[0-9]+/ && !/_TEXT/{ key = sprintf("%d", $3); consts[$2] = key; }/^#define GETDNS_[A-Z_]+[ 	]+\(\(getdns_(return|append_name)_t) [0-9]+ \)/{ key = sprintf("%d", $4); consts[$2] = key; }END{ n = asorti(consts, const_vals); for ( i = 1; i <= n; i++) { val = const_vals[i]; name = consts[val]; print "\t{ \""val"\", "name" },"}}' getdns/getdns.h.in getdns/getdns_extra.h.in | sed 's/,,/,/g' >> const-info.c
 cat >> const-info.c << END_OF_TAIL
 };
 
@@ -32,6 +40,25 @@ _getdns_get_const_info(int value)
 	return consts_info;
 }
 
+static int const_name_info_cmp(const void *a, const void *b)
+{
+	return strcmp( ((struct const_name_info *) a)->name
+	             , ((struct const_name_info *) b)->name );
+}
+int
+_getdns_get_const_name_info(const char *name, int *code)
+{
+	struct const_name_info key = { name, 0 };
+	struct const_name_info *i = bsearch(&key, consts_name_info,
+	    sizeof(consts_name_info) / sizeof(struct const_name_info),
+	    sizeof(struct const_name_info), const_name_info_cmp);
+	if (!i)
+		return 0;
+	if (code)
+		*code = i->code;
+	return 1;
+}
+
 const char *
 getdns_get_errorstr_by_id(uint16_t err)
 {
diff --git a/src/mk-symfiles.sh b/src/mk-symfiles.sh
index 878196b9..56dc4f43 100755
--- a/src/mk-symfiles.sh
+++ b/src/mk-symfiles.sh
@@ -10,6 +10,7 @@ write_symbols() {
 write_symbols libgetdns.symbols getdns/getdns.h.in getdns/getdns_extra.h.in
 echo plain_mem_funcs_user_arg >> libgetdns.symbols
 echo priv_getdns_context_mf >> libgetdns.symbols
+echo _getdns_get_const_name_info >> libgetdns.symbols
 write_symbols extension/libevent.symbols getdns/getdns_ext_libevent.h
 write_symbols extension/libev.symbols getdns/getdns_ext_libev.h
 write_symbols extension/libuv.symbols getdns/getdns_ext_libuv.h
diff --git a/src/request-internal.c b/src/request-internal.c
index b36cb85e..db555266 100644
--- a/src/request-internal.c
+++ b/src/request-internal.c
@@ -197,8 +197,6 @@ network_req_init(getdns_network_req *net_req, getdns_dns_req *owner,
 	buf = net_req->query;
 	gldns_write_uint16(buf + 2, 0); /* reset all flags */
 	GLDNS_RD_SET(buf);
-	if (dnssec_extension_set) /* We will do validation ourselves */
-		GLDNS_CD_SET(buf);
 	GLDNS_OPCODE_SET(buf, GLDNS_PACKET_QUERY);
 	gldns_write_uint16(buf + GLDNS_QDCOUNT_OFF, 1); /* 1 query */
 	gldns_write_uint16(buf + GLDNS_ANCOUNT_OFF, 0); /* 0 answers */
@@ -209,6 +207,8 @@ network_req_init(getdns_network_req *net_req, getdns_dns_req *owner,
 	gldns_buffer_init_frm_data(
 	    &gbuf, net_req->query, net_req->wire_data_sz - 2);
 	_getdns_reply_dict2wire(extensions, &gbuf, 1);
+	if (dnssec_extension_set) /* We will do validation ourselves */
+		GLDNS_CD_SET(net_req->query);
 
 	if (with_opt) {
 		net_req->opt = buf;
diff --git a/src/stub.c b/src/stub.c
index ab7f1805..fe35f733 100644
--- a/src/stub.c
+++ b/src/stub.c
@@ -324,7 +324,11 @@ process_keepalive(
 		if (netreq->keepalive_sent == 1)
 			/* If no keepalive sent back, then we must use 0 idle timeout
 			   as server does not support it.*/
+#if defined(KEEP_CONNECTIONS_OPEN_DEBUG) && KEEP_CONNECTIONS_OPEN_DEBUG
+			upstream->keepalive_timeout = netreq->owner->context->idle_timeout;
+#else
 			upstream->keepalive_timeout = 0;
+#endif
 		return;
 	}
 	/* Use server sent value unless the client specified a shorter one.
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index d80d8c17..7c5ea114 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -94,6 +94,9 @@ $(ALL_OBJS):
 $(NON_C99_OBJS):
 	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 -c $(srcdir)/$(@:.lo=.c) -o $@
 
+jsmn.lo:
+	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -DJSMN_GETDNS -c $(srcdir)/jsmn/jsmn.c -o $@
+
 tests_dict: tests_dict.lo testmessages.lo
 	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -o $@ tests_dict.lo testmessages.lo
 
@@ -124,8 +127,8 @@ check_getdns_uv: check_getdns.lo check_getdns_common.lo check_getdns_context_set
 check_getdns_ev: check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libev.lo ../libgetdns_ext_ev.la
 	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libev.lo $(LDFLAGS) $(LDLIBS) $(CHECK_CFLAGS) $(CHECK_LIBS) ../libgetdns_ext_ev.la $(EXTENSION_LIBEV_LDFLAGS) $(EXTENSION_LIBEV_EXT_LIBS)
 
-getdns_query: getdns_query.lo
-	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ getdns_query.lo $(LDFLAGS) $(LDLIBS)
+getdns_query: getdns_query.lo jsmn.lo
+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ getdns_query.lo jsmn.lo $(LDFLAGS) $(LDLIBS)
 
 scratchpad: scratchpad.lo
 	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ scratchpad.lo $(LDFLAGS) $(LDLIBS)
@@ -212,6 +215,8 @@ depend:
 		    -e 's? \.\./getdns/getdns_ext_libev\.h? $$(srcdir)/../getdns/getdns_ext_libev.h?g' \
 		    -e 's? \.\./getdns/getdns_ext_libuv\.h? $$(srcdir)/../getdns/getdns_ext_libuv.h?g' \
 		    -e 's? \.\./debug\.h? $$(srcdir)/../debug.h?g' \
+		    -e 's? \.\./const-info\.h? $$(srcdir)/../const-info.h?g' \
+		    -e 's? jsmn/jsmn\.h? $$(srcdir)/jsmn/jsmn.h?g' \
 		    -e 's!\(.*\)\.o[ :]*!\1.lo \1.o: !g' >> Makefile.in.new )
 	(cd $(srcdir) ; diff Makefile.in.new Makefile.in && rm Makefile.in.new \
 	                                                 || mv Makefile.in.new Makefile.in )
@@ -222,27 +227,28 @@ depend:
 
 # Dependencies for the unit tests
 check_getdns.lo check_getdns.o: $(srcdir)/check_getdns.c ../getdns/getdns.h $(srcdir)/check_getdns_common.h \
- ../getdns/getdns_extra.h $(srcdir)/check_getdns_general.h \
- $(srcdir)/check_getdns_general_sync.h $(srcdir)/check_getdns_address.h \
- $(srcdir)/check_getdns_address_sync.h $(srcdir)/check_getdns_hostname.h \
- $(srcdir)/check_getdns_hostname_sync.h $(srcdir)/check_getdns_context_create.h \
- $(srcdir)/check_getdns_context_destroy.h $(srcdir)/check_getdns_cancel_callback.h \
- $(srcdir)/check_getdns_list_get_length.h $(srcdir)/check_getdns_list_get_data_type.h \
- $(srcdir)/check_getdns_list_get_dict.h $(srcdir)/check_getdns_list_get_list.h \
- $(srcdir)/check_getdns_list_get_int.h $(srcdir)/check_getdns_list_get_bindata.h \
- $(srcdir)/check_getdns_dict_get_names.h $(srcdir)/check_getdns_dict_get_data_type.h \
- $(srcdir)/check_getdns_dict_get_dict.h $(srcdir)/check_getdns_dict_get_list.h \
- $(srcdir)/check_getdns_dict_get_bindata.h $(srcdir)/check_getdns_dict_get_int.h \
- $(srcdir)/check_getdns_dict_destroy.h $(srcdir)/check_getdns_dict_set_dict.h \
- $(srcdir)/check_getdns_dict_set_list.h $(srcdir)/check_getdns_dict_set_bindata.h \
- $(srcdir)/check_getdns_dict_set_int.h $(srcdir)/check_getdns_convert_ulabel_to_alabel.h \
- $(srcdir)/check_getdns_convert_alabel_to_ulabel.h $(srcdir)/check_getdns_pretty_print_dict.h \
- $(srcdir)/check_getdns_display_ip_address.h \
+ ../getdns/getdns_extra.h $(srcdir)/check_getdns_address.h \
+ $(srcdir)/check_getdns_address_sync.h $(srcdir)/check_getdns_cancel_callback.h \
+ $(srcdir)/check_getdns_context_create.h $(srcdir)/check_getdns_context_destroy.h \
  $(srcdir)/check_getdns_context_set_context_update_callback.h \
+ $(srcdir)/check_getdns_context_set_dns_transport.h \
  $(srcdir)/check_getdns_context_set_timeout.h \
  $(srcdir)/check_getdns_context_set_upstream_recursive_servers.h \
+ $(srcdir)/check_getdns_convert_alabel_to_ulabel.h \
+ $(srcdir)/check_getdns_convert_ulabel_to_alabel.h $(srcdir)/check_getdns_dict_destroy.h \
+ $(srcdir)/check_getdns_dict_get_bindata.h $(srcdir)/check_getdns_dict_get_data_type.h \
+ $(srcdir)/check_getdns_dict_get_dict.h $(srcdir)/check_getdns_dict_get_int.h \
+ $(srcdir)/check_getdns_dict_get_list.h $(srcdir)/check_getdns_dict_get_names.h \
+ $(srcdir)/check_getdns_dict_set_bindata.h $(srcdir)/check_getdns_dict_set_dict.h \
+ $(srcdir)/check_getdns_dict_set_int.h $(srcdir)/check_getdns_dict_set_list.h \
+ $(srcdir)/check_getdns_display_ip_address.h $(srcdir)/check_getdns_general.h \
+ $(srcdir)/check_getdns_general_sync.h $(srcdir)/check_getdns_hostname.h \
+ $(srcdir)/check_getdns_hostname_sync.h $(srcdir)/check_getdns_list_get_bindata.h \
+ $(srcdir)/check_getdns_list_get_data_type.h $(srcdir)/check_getdns_list_get_dict.h \
+ $(srcdir)/check_getdns_list_get_int.h $(srcdir)/check_getdns_list_get_length.h \
+ $(srcdir)/check_getdns_list_get_list.h $(srcdir)/check_getdns_pretty_print_dict.h \
  $(srcdir)/check_getdns_service.h $(srcdir)/check_getdns_service_sync.h \
- $(srcdir)/check_getdns_transport.h $(srcdir)/check_getdns_context_set_dns_transport.h
+ $(srcdir)/check_getdns_transport.h
 check_getdns_common.lo check_getdns_common.o: $(srcdir)/check_getdns_common.c ../getdns/getdns.h \
  ../config.h $(srcdir)/check_getdns_common.h ../getdns/getdns_extra.h \
  $(srcdir)/check_getdns_eventloop.h
@@ -265,7 +271,7 @@ check_getdns_transport.lo check_getdns_transport.o: $(srcdir)/check_getdns_trans
  $(srcdir)/check_getdns_transport.h $(srcdir)/check_getdns_common.h ../getdns/getdns.h \
  ../getdns/getdns_extra.h
 getdns_query.lo getdns_query.o: $(srcdir)/getdns_query.c ../config.h $(srcdir)/../debug.h ../config.h \
- ../getdns/getdns.h ../getdns/getdns_extra.h
+ $(srcdir)/../const-info.h $(srcdir)/jsmn/jsmn.h ../getdns/getdns.h ../getdns/getdns_extra.h
 scratchpad.template.lo scratchpad.template.o: scratchpad.template.c ../getdns/getdns.h \
  ../getdns/getdns_extra.h
 testmessages.lo testmessages.o: $(srcdir)/testmessages.c $(srcdir)/testmessages.h
diff --git a/src/test/getdns_query.c b/src/test/getdns_query.c
index 737a3b11..bce8294d 100644
--- a/src/test/getdns_query.c
+++ b/src/test/getdns_query.c
@@ -27,12 +27,26 @@
 
 #include "config.h"
 #include "debug.h"
+#include "const-info.h"
+#include "jsmn/jsmn.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
 #include <getdns/getdns.h>
 #include <getdns/getdns_extra.h>
+#ifndef USE_WINSOCK
+#include <arpa/inet.h>
+#include <sys/time.h>
+#include <netdb.h>
+#else
+#include <winsock2.h>
+#include <iphlpapi.h>
+typedef unsigned short in_port_t;
+#include <windows.h>
+#include <wincrypt.h>
+#endif
+
 
 #define MAX_TIMEOUTS FD_SETSIZE
 
@@ -263,8 +277,12 @@ static char *the_root = ".";
 static char *name;
 static getdns_context *context;
 static getdns_dict *extensions;
+static getdns_dict *query_extensions_spc = NULL;
 static getdns_list *pubkey_pinset = NULL;
+static getdns_list *listen_list = NULL;
+static getdns_dict *listen_dict = NULL;
 static size_t pincount = 0;
+static size_t listen_count = 0;
 static uint16_t request_type = GETDNS_RRTYPE_NS;
 static int timeout, edns0_size, padding_blocksize;
 static int async = 0, interactive = 0;
@@ -344,6 +362,7 @@ ipaddr_dict(getdns_context *context, char *ipstr)
 	char *T = strchr(ipstr, '^'), *tsig_name_str = ""
 	                            , *tsig_secret_str = ""
 	                            , *tsig_algorithm_str = "";
+	char *br, *c;
 	int            tsig_secret_size;
 	uint8_t        tsig_secret_buf[256]; /* 4 times SHA512 */
 	getdns_bindata tsig_secret;
@@ -353,6 +372,23 @@ ipaddr_dict(getdns_context *context, char *ipstr)
 	addr.data = buf;
 
 	if (!r) return NULL;
+
+	if (*ipstr == '[') {
+		char *br = strchr(ipstr, ']');
+		if (br) {
+			ipstr += 1;
+			*br = 0;
+			if ((c = strchr(br + 1, ':'))) {
+				p = c;
+			}
+		}
+	} else if ((br = strchr(ipstr, '.')) && (c = strchr(br + 1, ':'))
+	    && (T == NULL || c < T))
+		p = c;
+
+	else if ((*ipstr == '*') && (c = strchr(ipstr+1, ':')))
+		p = c;
+
 	if (s) {
 		*s = 0;
 		scope_id_str = s + 1;
@@ -385,7 +421,11 @@ ipaddr_dict(getdns_context *context, char *ipstr)
 			tsig_name_str = "";
 		}
 	}
-	if (strchr(ipstr, ':')) {
+	if (*ipstr == '*') {
+		getdns_dict_util_set_string(r, "address_type", "IPv6");
+		addr.size = 16;
+		(void) memset(buf, 0, 16);
+	} else if (strchr(ipstr, ':')) {
 		getdns_dict_util_set_string(r, "address_type", "IPv6");
 		addr.size = 16;
 		if (inet_pton(AF_INET6, ipstr, buf) <= 0) {
@@ -458,15 +498,17 @@ void
 print_usage(FILE *out, const char *progname)
 {
 	fprintf(out, "usage: %s [<option> ...] \\\n"
-	    "\t\t[@<upstream> ...] [+<extension> ...] [<name>] [<type>]\n", progname);
+	    "\t[@<upstream> ...] [+<extension> ...] [\'{ <settings> }\'] [<name>] [<type>]\n", progname);
 	fprintf(out, "\ndefault mode: "
 #ifdef HAVE_LIBUNBOUND
 	    "recursive"
 #else
 	    "stub"
 #endif
-	    ", synchronous resolution of NS record using UDP with TCP fallback\n");
-	fprintf(out, "\nupstreams: @<ip>[%%<scope_id>][@<port>][#<tls port>][~<tls name>][^<tsig spec>]\n");
+	    ", synchronous resolution of NS record\n\t\tusing UDP with TCP fallback\n");
+	fprintf(out, "\nupstreams: @<ip>[%%<scope_id>][@<port>][#<tls port>][~<tls name>][^<tsig spec>]");
+	fprintf(out, "\n            <ip>@<port> may be given as <IPv4>:<port>");
+	fprintf(out, "\n                  or \'[\'<IPv6>[%%<scope_id>]\']\':<port> too\n");
 	fprintf(out, "\ntsig spec: [<algorithm>:]<name>:<secret in Base64>\n");
 	fprintf(out, "\nextensions:\n");
 	fprintf(out, "\t+add_warning_for_bad_dns\n");
@@ -486,6 +528,7 @@ print_usage(FILE *out, const char *progname)
 	fprintf(out, "\t+sit=<cookie>\t\tSend along cookie OPT with value <cookie>\n");
 	fprintf(out, "\t+specify_class=<class>\n");
 	fprintf(out, "\t+0\t\t\tClear all extensions\n");
+	fprintf(out, "\nsettings in json dict format (like outputted by -i option).\n");
 	fprintf(out, "\noptions:\n");
 	fprintf(out, "\t-a\tPerform asynchronous resolution "
 	    "(default = synchronous)\n");
@@ -493,6 +536,10 @@ print_usage(FILE *out, const char *progname)
 	fprintf(out, "\t-B\tBatch mode. Schedule all messages before processing responses.\n");
 	fprintf(out, "\t-b <bufsize>\tSet edns0 max_udp_payload size\n");
 	fprintf(out, "\t-c\tSend Client Subnet privacy request\n");
+	fprintf(out, "\t-C\t<filename>\n");
+	fprintf(out, "\t\tRead settings from config file <filename>\n");
+	fprintf(out, "\t\tThe getdns context will be configured with these settings\n");
+	fprintf(out, "\t\tThe file must be in json dict format.\n");
 	fprintf(out, "\t-D\tSet edns0 do bit\n");
 	fprintf(out, "\t-d\tclear edns0 do bit\n");
 	fprintf(out, "\t-e <idle_timeout>\tSet idle timeout in miliseconds\n");
@@ -512,9 +559,9 @@ print_usage(FILE *out, const char *progname)
 	fprintf(out, "\t-m\tSet TLS authentication mode to REQUIRED\n");
 	fprintf(out, "\t-p\tPretty print response dict\n");
 	fprintf(out, "\t-P <blocksize>\tPad TLS queries to a multiple of blocksize\n");
+	fprintf(out, "\t-q\tQuiet mode - don't print response\n");
 	fprintf(out, "\t-r\tSet recursing resolution type\n");
 	fprintf(out, "\t-R <filename>\tRead root hints from <filename>\n");
-	fprintf(out, "\t-q\tQuiet mode - don't print response\n");
 	fprintf(out, "\t-s\tSet stub resolution type (default = recursing)\n");
 	fprintf(out, "\t-S\tservice lookup (<type> is ignored)\n");
 	fprintf(out, "\t-t <timeout>\tSet timeout in miliseconds\n");
@@ -536,7 +583,10 @@ print_usage(FILE *out, const char *progname)
 	fprintf(out, "\t-U\tSet transport to UDP only\n");
 	fprintf(out, "\t-l <transports>\tSet transport list. List can contain 1 of each of the characters\n");
 	fprintf(out, "\t\t\t U T L S for UDP, TCP or TLS e.g 'UT' or 'LTU' \n");
-
+	fprintf(out, "\t-z <listen address>\n");
+	fprintf(out, "\t\tListen for DNS requests on the given IP address\n");
+	fprintf(out, "\t\t<listen address> is in the same format as upstreams.\n");
+	fprintf(out, "\t\tThis option can be given more than once.\n");
 }
 
 static getdns_return_t validate_chain(getdns_dict *response)
@@ -715,6 +765,647 @@ done:
 	return r;
 }
 
+static int _jsmn_get_data(char *js, jsmntok_t *t, getdns_bindata **value)
+{
+	size_t i, j;
+	uint8_t h, l;
+
+	if ((t->end - t->start) < 4 || (t->end - t->start) % 2 == 1 ||
+	    js[t->start] != '0' || js[t->start + 1] != 'x')
+		return 0;
+
+	for (i = t->start + 2; i < t->end; i++)
+		if (!((js[i] >= '0' && js[i] <= '9')
+		    ||(js[i] >= 'a' && js[i] <= 'f')
+		    ||(js[i] >= 'A' && js[i] <= 'F')))
+			return 0;
+
+	if (!(*value = malloc(sizeof(getdns_bindata))))
+		return 0;
+
+	else if (!((*value)->data = malloc((t->end - t->start) / 2 - 1))) {
+		free(*value);
+		return 0;
+	}
+	for (i = t->start + 2, j = 0; i < t->end; i++, j++) {
+		h = js[i] >= '0' && js[i] <= '9' ? js[i] - '0'
+		  : js[i] >= 'A' && js[i] <= 'F' ? js[i] + 10 - 'A'
+		                                 : js[i] + 10 - 'a';
+		h <<= 4;
+		i++;
+		l = js[i] >= '0' && js[i] <= '9' ? js[i] - '0'
+		  : js[i] >= 'A' && js[i] <= 'F' ? js[i] + 10 - 'A'
+		                                 : js[i] + 10 - 'a';
+		(*value)->data[j] = h | l;
+	}
+	(*value)->size = j;
+	return 1;
+}
+
+static int _jsmn_get_ipdict(char *js, jsmntok_t *t, getdns_dict **value)
+{
+	char c = js[t->end];
+
+	js[t->end] = '\0';
+	*value = ipaddr_dict(context, js + t->start);
+	js[t->end] = c;
+	return *value != NULL;
+}
+
+static int _jsmn_get_dname(char *js, jsmntok_t *t, getdns_bindata **value)
+{
+	char c = js[t->end];
+	getdns_return_t r;
+
+	if (t->end <= t->start || js[t->end - 1] != '.')
+		return 0;
+
+	js[t->end] = '\0';
+	r = getdns_convert_fqdn_to_dns_name(js + t->start, value);
+	js[t->end] = c;
+
+	return r == GETDNS_RETURN_GOOD;
+}
+
+static int _jsmn_get_ipv4(char *js, jsmntok_t *t, getdns_bindata **value)
+{
+	char c = js[t->end];
+	uint8_t buf[4];
+
+	js[t->end] = '\0';
+	if (inet_pton(AF_INET, js + t->start, buf) <= 0)
+		; /* pass */
+
+	else if (!(*value = malloc(sizeof(getdns_bindata))))
+		; /* pass */
+
+	else if (!((*value)->data = malloc(4)))
+		free(*value);
+
+	else {
+		js[t->end] = c;
+		(*value)->size = 4;
+		(void) memcpy((*value)->data, buf, 4);
+		return 1;
+	}
+	js[t->end] = c;
+	return 0;
+}
+
+static int _jsmn_get_ipv6(char *js, jsmntok_t *t, getdns_bindata **value)
+{
+	char c = js[t->end];
+	uint8_t buf[16];
+
+	js[t->end] = '\0';
+	if (inet_pton(AF_INET6, js + t->start, buf) <= 0)
+		; /* pass */
+
+	else if (!(*value = malloc(sizeof(getdns_bindata))))
+		; /* pass */
+
+	else if (!((*value)->data = malloc(16)))
+		free(*value);
+
+	else {
+		js[t->end] = c;
+		(*value)->size = 16;
+		(void) memcpy((*value)->data, buf, 16);
+		return 1;
+	}
+	js[t->end] = c;
+	return 0;
+}
+
+static int _jsmn_get_integer(char *js, jsmntok_t *t, uint32_t *num)
+{
+	char c = js[t->end];
+	;unsigned long int value;
+	char *endptr;
+
+	js[t->end] = '\0';
+	value = strtoul(js + t->start, &endptr, 10);
+	if (js[t->start] != '\0' && *endptr == '\0') {
+		js[t->end] = c;
+		*num = value;
+		return 1;
+	}
+	js[t->end] = c;
+	return 0;
+}
+
+static int _jsmn_get_constant(char *js, jsmntok_t *t, uint32_t *num)
+{
+	char c = js[t->end];
+	int code;
+
+	js[t->end] = '\0';
+	if (_getdns_get_const_name_info(js + t->start, &code)) {
+		js[t->end] = c;
+		*num = code;
+		return 1;
+	}
+	js[t->end] = c;
+	return 0;
+}
+
+static int _jsmn_get_dict(char *js, jsmntok_t *t, size_t count,
+    getdns_dict **dict, getdns_return_t *r);
+
+static int _jsmn_get_list(char *js, jsmntok_t *t, size_t count,
+    getdns_list **list, getdns_return_t *r)
+{
+	getdns_list *new_list, *child_list;
+	getdns_dict *child_dict;
+	size_t i, j;
+	getdns_bindata bindata;
+	size_t index = 0;
+	uint32_t num;
+	getdns_bindata *value;
+
+	if (t->type != JSMN_ARRAY) {
+		*r = GETDNS_RETURN_WRONG_TYPE_REQUESTED;
+		return 0;
+	}
+	new_list = getdns_list_create();
+	j = 1;
+	for (i = 0; i < t->size; i++) {
+		switch (t[j].type) {
+		case JSMN_OBJECT:
+			j += _jsmn_get_dict(js, t+j, count-j, &child_dict, r);
+			if (*r) {
+				getdns_list_destroy(new_list);
+				return 0;
+			}
+			*r = getdns_list_set_dict(new_list, index++, child_dict);
+			getdns_dict_destroy(child_dict);
+			if (*r) {
+				getdns_list_destroy(new_list);
+				return 0;
+			}
+			break;
+		case JSMN_ARRAY:
+			j += _jsmn_get_list(js, t+j, count-j, &child_list, r);
+			if (*r) {
+				getdns_list_destroy(new_list);
+				return 0;
+			}
+			*r = getdns_list_set_list(new_list, index++, child_list);
+			getdns_list_destroy(child_list);
+			if (*r) {
+				getdns_list_destroy(new_list);
+				return 0;
+			}
+			break;
+		case JSMN_STRING:
+			bindata.size = t[j].end - t[j].start;
+			bindata.data = (uint8_t *)js + t[j].start;
+			*r = getdns_list_set_bindata(
+			    new_list, index++, &bindata);
+			if (*r) {
+				getdns_list_destroy(new_list);
+				return 0;
+			}
+			j += 1;
+			break;
+		case JSMN_PRIMITIVE:
+			if (_jsmn_get_integer(js, t+j, &num) ||
+			    _jsmn_get_constant(js, t+j, &num)) {
+				*r = getdns_list_set_int(
+				    new_list, index++, num);
+			} else if (_jsmn_get_dname(js, t+j, &value) ||
+			    _jsmn_get_ipv4(js, t+j, &value) ||
+			    _jsmn_get_ipv6(js, t+j, &value) ||
+			    _jsmn_get_data(js, t+j, &value)) {
+
+				*r = getdns_list_set_bindata(
+				    new_list, index++, value);
+
+				free(value->data);
+				free(value);
+
+			} else if (_jsmn_get_ipdict(js, t+j, &child_dict)) {
+				*r = getdns_list_set_dict(
+				    new_list, index++, child_dict);
+				getdns_dict_destroy(child_dict);
+			} else {
+				fprintf(stderr, "Could not convert primitive %.*s\n",
+				    t[j].end  - t[j].start, js+t[j].start);
+				*r = GETDNS_RETURN_WRONG_TYPE_REQUESTED;
+			}
+			if (*r) {
+				getdns_list_destroy(new_list);
+				return 0;
+			}
+			j += 1;
+			break;
+
+		default:
+			*r = GETDNS_RETURN_WRONG_TYPE_REQUESTED;
+			getdns_list_destroy(new_list);
+			return 0;
+		}
+	}
+	*list = new_list;
+	*r = GETDNS_RETURN_GOOD;
+	return j;
+}
+
+static int _jsmn_get_dict(char *js, jsmntok_t *t, size_t count,
+    getdns_dict **dict, getdns_return_t *r)
+{
+	getdns_dict *new_dict, *child_dict;
+	getdns_list *child_list;
+	size_t i, j;
+	getdns_bindata bindata;
+	char *key;
+	uint32_t num;
+	getdns_bindata *value;
+
+	if (t->type != JSMN_OBJECT) {
+		*r = GETDNS_RETURN_WRONG_TYPE_REQUESTED;
+		return 0;
+	}
+	new_dict = getdns_dict_create();
+	j = 1;
+	for (i = 0; i < t->size; i++) {
+		if (t[j].type == JSMN_UNDEFINED)
+			/* Happend when primitives are used as keys */
+			break;
+
+		if (t[j].type != JSMN_STRING &&
+		    t[j].type != JSMN_PRIMITIVE) {
+			*r = GETDNS_RETURN_WRONG_TYPE_REQUESTED;
+			getdns_dict_destroy(new_dict);
+			return 0;
+		}
+		key = js + t[j].start;
+			js[t[j].end] = '\0';
+		j += 1;
+		switch (t[j].type) {
+		case JSMN_OBJECT:
+			j += _jsmn_get_dict(js, t+j, count-j, &child_dict, r);
+			if (*r) {
+				getdns_dict_destroy(new_dict);
+				return 0;
+			}
+			*r = getdns_dict_set_dict(new_dict, key, child_dict);
+			getdns_dict_destroy(child_dict);
+			if (*r) {
+				getdns_dict_destroy(new_dict);
+				return 0;
+			}
+			break;
+		case JSMN_ARRAY:
+			j += _jsmn_get_list(js, t+j, count-j, &child_list, r);
+			if (*r) {
+				getdns_dict_destroy(new_dict);
+				return 0;
+			}
+			*r = getdns_dict_set_list(new_dict, key, child_list);
+			getdns_list_destroy(child_list);
+			if (*r) {
+				getdns_dict_destroy(new_dict);
+				return 0;
+			}
+			break;
+		case JSMN_STRING:
+			bindata.size = t[j].end - t[j].start;
+			bindata.data = (uint8_t *)js + t[j].start;
+			*r = getdns_dict_set_bindata(
+			    new_dict, key, &bindata);
+			if (*r) {
+				getdns_dict_destroy(new_dict);
+				return 0;
+			}
+			j += 1;
+			break;
+		case JSMN_PRIMITIVE:
+			if (_jsmn_get_integer(js, t+j, &num) ||
+			    _jsmn_get_constant(js, t+j, &num)) {
+				*r = getdns_dict_set_int(
+				    new_dict, key, num);
+			} else if (_jsmn_get_dname(js, t+j, &value) ||
+			    _jsmn_get_ipv4(js, t+j, &value) ||
+			    _jsmn_get_ipv6(js, t+j, &value) ||
+			    _jsmn_get_data(js, t+j, &value)) {
+
+				*r = getdns_dict_set_bindata(
+				    new_dict, key, value);
+
+				free(value->data);
+				free(value);
+
+			} else if (_jsmn_get_ipdict(js, t+j, &child_dict)) {
+				*r = getdns_dict_set_dict(
+				    new_dict, key, child_dict);
+				getdns_dict_destroy(child_dict);
+			} else {
+				*r = GETDNS_RETURN_WRONG_TYPE_REQUESTED;
+				fprintf(stderr, "Could not convert primitive %.*s\n",
+				    t[j].end  - t[j].start, js+t[j].start);
+			}
+			if (*r) {
+				getdns_dict_destroy(new_dict);
+				return 0;
+			}
+			j += 1;
+			break;
+
+		default:
+			*r = GETDNS_RETURN_WRONG_TYPE_REQUESTED;
+			getdns_dict_destroy(new_dict);
+			return 0;
+		}
+	}
+	*dict = new_dict;
+	*r = GETDNS_RETURN_GOOD;
+	return j;
+}
+
+static int _streq(const getdns_bindata *name, const char *str)
+{
+	if (strlen(str) != name->size)
+		return 0;
+	else	return strncmp((const char *)name->data, str, name->size) == 0;
+}
+
+static getdns_return_t _get_list_or_read_file(const getdns_dict *config,
+    const char *setting, getdns_list **r_list, int *destroy_list)
+{
+	getdns_bindata *fn_bd;
+	char fn[FILENAME_MAX];
+	FILE *fh;
+	getdns_return_t r;
+
+	assert(r_list);
+	assert(destroy_list);
+
+	*destroy_list = 0;
+	if (!(r = getdns_dict_get_list(config, setting, r_list)))
+		return GETDNS_RETURN_GOOD;
+
+	else if ((r = getdns_dict_get_bindata(config, setting, &fn_bd)))
+		return r;
+
+	else if (fn_bd->size >= FILENAME_MAX)
+		return GETDNS_RETURN_INVALID_PARAMETER;
+
+	(void)memcpy(fn, fn_bd->data, fn_bd->size);
+	fn[fn_bd->size] = 0;
+
+	if (!(fh = fopen(fn, "r"))) {
+		fprintf(stderr, "Could not open \"%s\": %s\n"
+		              , fn, strerror(errno));
+		return GETDNS_RETURN_GENERIC_ERROR;
+	}
+	if ((r = getdns_fp2rr_list(fh, r_list, NULL, 3600)))
+		fprintf(stderr,"Could not parse \"%s\"\n", fn);
+
+	else	*destroy_list = 1;
+
+	fclose(fh);
+	return r;
+}
+
+#define CONTEXT_SETTING_INT(X) \
+	} else 	if (_streq(setting, #X)) { \
+		if ((r = getdns_dict_get_int(config, #X , &n))) \
+			fprintf(stderr, "Could not get \"" #X "\""); \
+		else if ((r = getdns_context_set_ ## X (context, n))) \
+			fprintf(stderr,"Error configuring \"" #X "\"");
+
+#define CONTEXT_SETTING_LIST(X) \
+	} else 	if (_streq(setting, #X)) { \
+		if ((r = getdns_dict_get_list(config, #X , &list))) \
+			fprintf(stderr, "Could not get \"" #X "\""); \
+		else if ((r = getdns_context_set_ ## X (context, list))) \
+			fprintf(stderr,"Error configuring \"" #X "\"");
+
+#define CONTEXT_SETTING_LIST_OR_ZONEFILE(X) \
+	} else if (_streq(setting, #X)) { \
+		if ((r = _get_list_or_read_file( \
+		    config, #X , &list, &destroy_list))) \
+			fprintf(stderr, "Could not get \"" #X "\""); \
+		else if ((r = getdns_context_set_ ## X(context, list))) \
+			fprintf(stderr, "Error configuring \"" #X "\""); \
+		if (destroy_list) getdns_list_destroy(list);
+
+#define CONTEXT_SETTING_ARRAY(X, T) \
+	} else 	if (_streq(setting, #X )) { \
+		if ((r = getdns_dict_get_list(config, #X , &list))) \
+			fprintf(stderr, "Could not get \"" #X "\""); \
+		else if ((r =  getdns_list_get_length(list, &count))) \
+			fprintf(stderr, "Could not length of \"" #X "\""); \
+		else for (i=0; i<count && i<(sizeof(X)/sizeof(*X)); i++) { \
+			if ((r = getdns_list_get_int(list, i, &n))) { \
+				fprintf(stderr,"Could not get "#X"[%zu]",i); \
+				break; \
+			} \
+			X[i] = (getdns_ ## T ## _t)n; \
+		} \
+		if (!r && (r = getdns_context_set_ ##X (context, count, X))) \
+			fprintf(stderr,"Error configuring \"" #X "\""); \
+
+#define EXTENSION_SETTING_INT(X) \
+	} else if (_streq(setting, #X )) { \
+		if ((r = getdns_dict_get_int(config, #X , &n))) \
+			fprintf(stderr, "Could not get \"" #X "\""); \
+		else if ((r = getdns_dict_set_int(extensions, #X , n))) \
+			fprintf(stderr,"Error setting \"" #X "\"");
+
+#define EXTENSION_SETTING_DICT(X) \
+	} else if (_streq(setting, #X )) { \
+		if ((r = getdns_dict_get_dict(config, #X , &dict))) \
+			fprintf(stderr, "Could not get \"" #X "\""); \
+		else if ((r = getdns_dict_set_dict(extensions, #X , dict))) \
+			fprintf(stderr,"Error setting \"" #X "\"");
+
+static getdns_return_t configure_with_config_dict(const getdns_dict *config);
+static getdns_return_t configure_setting_with_config_dict(
+    const getdns_dict *config, const getdns_bindata *setting)
+{
+	getdns_return_t r = GETDNS_RETURN_GOOD;
+	getdns_dict *dict;
+	getdns_list *list;
+	getdns_namespace_t namespaces[100];
+	getdns_transport_list_t dns_transport_list[100];
+	size_t count, i;
+	uint32_t n;
+	int destroy_list = 0;
+
+	if (_streq(setting, "all_context")) {
+		if ((r = getdns_dict_get_dict(config, "all_context", &dict)))
+			fprintf(stderr, "Could not get \"all_context\"");
+
+		else if ((r = configure_with_config_dict(dict)))
+			fprintf( stderr
+			       ,"Error configuring with \"all_context\"");
+
+	CONTEXT_SETTING_INT(resolution_type)
+	CONTEXT_SETTING_ARRAY(namespaces, namespace)
+	CONTEXT_SETTING_INT(dns_transport)
+	CONTEXT_SETTING_ARRAY(dns_transport_list, transport_list)
+	CONTEXT_SETTING_INT(idle_timeout)
+	CONTEXT_SETTING_INT(limit_outstanding_queries)
+	CONTEXT_SETTING_INT(timeout)
+	CONTEXT_SETTING_INT(follow_redirects)
+	CONTEXT_SETTING_LIST_OR_ZONEFILE(dns_root_servers)
+	CONTEXT_SETTING_INT(append_name)
+	CONTEXT_SETTING_LIST(suffix)
+	CONTEXT_SETTING_LIST_OR_ZONEFILE(dnssec_trust_anchors)
+	CONTEXT_SETTING_INT(dnssec_allowed_skew)
+	CONTEXT_SETTING_LIST(upstream_recursive_servers)
+	CONTEXT_SETTING_INT(edns_maximum_udp_payload_size)
+	CONTEXT_SETTING_INT(edns_extended_rcode)
+	CONTEXT_SETTING_INT(edns_version)
+	CONTEXT_SETTING_INT(edns_do_bit)
+
+	/***************************************/
+	/****                               ****/
+	/****  Unofficial context settings  ****/
+	/****                               ****/
+	/***************************************/
+
+	CONTEXT_SETTING_INT(edns_client_subnet_private)
+	CONTEXT_SETTING_INT(tls_authentication)
+	CONTEXT_SETTING_INT(tls_query_padding_blocksize)
+
+	}  else if (_streq(setting, "listen_addresses")) {
+		if ((r = getdns_dict_get_list(
+		    config, "listen_addresses", &list)))
+			fprintf(stderr, "Could not get \"listen_addresses\"");
+
+		else {
+			if (listen_list && !listen_dict) {
+				/* TODO: Stop listening */
+				getdns_list_destroy(listen_list);
+				listen_count = 0;
+				listen_list = NULL;
+			}
+			/* Strange construction to copy the list.
+			 * Needs to be done, because config dict
+			 * will get destroyed.
+			 */
+			if (!listen_dict &&
+			    !(listen_dict = getdns_dict_create())) {
+				fprintf(stderr, "Could not create "
+						"listen_dict");
+				r = GETDNS_RETURN_MEMORY_ERROR;
+
+			} else if ((r = getdns_dict_set_list(
+			    listen_dict, "listen_list", list)))
+				fprintf(stderr, "Could not set listen_list");
+
+			else if ((r = getdns_dict_get_list(
+			    listen_dict, "listen_list", &listen_list)))
+				fprintf(stderr, "Could not get listen_list");
+
+			else if ((r = getdns_list_get_length(
+			    listen_list, &listen_count)))
+				fprintf(stderr, "Could not get listen_count");
+		}
+
+	/**************************************/
+	/****                              ****/
+	/****  Default extensions setting  ****/
+	/****                              ****/
+	/**************************************/
+	EXTENSION_SETTING_DICT(add_opt_parameters)
+	EXTENSION_SETTING_INT(add_warning_for_bad_dns)
+	EXTENSION_SETTING_INT(dnssec_return_all_statuses)
+	EXTENSION_SETTING_INT(dnssec_return_full_validation_chain)
+	EXTENSION_SETTING_INT(dnssec_return_only_secure)
+	EXTENSION_SETTING_INT(dnssec_return_status)
+	EXTENSION_SETTING_INT(dnssec_return_validation_chain)
+#if defined(DNSSEC_ROADBLOCK_AVOIDANCE) && defined(HAVE_LIBUNBOUND)
+	EXTENSION_SETTING_INT(dnssec_roadblock_avoidance)
+#endif
+#ifdef EDNS_COOKIES
+	EXTENSION_SETTING_INT(edns_cookies)
+#endif
+	EXTENSION_SETTING_DICT(header)
+	EXTENSION_SETTING_INT(return_api_information)
+	EXTENSION_SETTING_INT(return_both_v4_and_v6)
+	EXTENSION_SETTING_INT(return_call_reporting)
+	EXTENSION_SETTING_INT(specify_class)
+
+	/************************************/
+	/****                            ****/
+	/****  Ignored context settings  ****/
+	/****                            ****/
+	/************************************/
+	} else if (!_streq(setting, "implementation_string") &&
+	    !_streq(setting, "version_string")) {
+		fprintf( stderr, "Unknown setting \"%.*s\""
+		       , (int)setting->size, (const char *)setting->data);
+		r = GETDNS_RETURN_NOT_IMPLEMENTED;
+	}
+	if (r)
+		fprintf(stderr, ": %s\n", getdns_get_errorstr_by_id(r));
+	return r;
+}
+
+static getdns_return_t configure_with_config_dict(const getdns_dict *config)
+{
+	getdns_list *names;
+	getdns_return_t r;
+	getdns_bindata *name;
+	size_t i;
+
+	if ((r = getdns_dict_get_names(config, &names)))
+		return r;
+
+	for (i = 0; !(r = getdns_list_get_bindata(names, i, &name)); i++) {
+		if ((r = configure_setting_with_config_dict(config, name)))
+			break;
+	}
+	if (r == GETDNS_RETURN_NO_SUCH_LIST_ITEM)
+		r = GETDNS_RETURN_GOOD;
+
+	getdns_list_destroy(names);
+	return r;
+}
+
+static void parse_config(char *config)
+{
+	jsmn_parser p;
+	jsmntok_t *tok = NULL, *new_tok;
+	size_t tokcount = 100;
+	int r;
+	getdns_return_t gr;
+	getdns_dict *d;
+
+	jsmn_init(&p);
+	tok = malloc(sizeof(*tok) * tokcount);
+	do {
+		r = jsmn_parse(&p, config, strlen(config), tok, tokcount);
+		if (r == JSMN_ERROR_NOMEM) {
+			fprintf(stderr, "new tokcount: %d\n", (int)tokcount);
+			tokcount *= 2;
+			if (!(new_tok = realloc(tok, sizeof(*tok)*tokcount))){
+				free(tok);
+				fprintf(stderr,
+				    "Memory error during config parsing\n");
+				return;
+			} 
+			tok  = new_tok;
+		}
+	} while (r == JSMN_ERROR_NOMEM);
+	if (r < 0) 
+		fprintf(stderr, "Config parse error: %d\n", r);
+	else {
+		(void) _jsmn_get_dict(config, tok, p.toknext, &d, &gr);
+		if (gr)
+			fprintf(stderr, "Config parse error: %d\n", (int)gr);
+		else {
+			configure_with_config_dict(d);
+			getdns_dict_destroy(d);
+		}
+	}
+	free(tok);
+}
+
 getdns_return_t parse_args(int argc, char **argv)
 {
 	getdns_return_t r = GETDNS_RETURN_GOOD;
@@ -730,6 +1421,8 @@ getdns_return_t parse_args(int argc, char **argv)
 	size_t upstream_count = 0;
 	FILE *fh;
 	uint32_t klass;
+	char *config_file = NULL;
+	long config_file_sz;
 
 	for (i = 1; i < argc; i++) {
 		arg = argv[i];
@@ -800,6 +1493,10 @@ getdns_return_t parse_args(int argc, char **argv)
 				    upstream_count++, upstream);
 			}
 			continue;
+		} else if (arg[0] == '{') {
+			parse_config(arg);
+			continue;
+
 		} else if (arg[0] != '-') {
 			name = arg;
 			continue;
@@ -832,6 +1529,49 @@ getdns_return_t parse_args(int argc, char **argv)
 				if (getdns_context_set_edns_client_subnet_private(context, 1))
 					return GETDNS_RETURN_GENERIC_ERROR;
 				break;
+			case 'C':
+				if (c[1] != 0 || ++i >= argc || !*argv[i]) {
+					fprintf(stderr, "file name expected "
+					    "after -C\n");
+					return GETDNS_RETURN_GENERIC_ERROR;
+				}
+				if (!(fh = fopen(argv[i], "r"))) {
+					fprintf(stderr, "Could not open \"%s\""
+					    ": %s\n",argv[i], strerror(errno));
+					return GETDNS_RETURN_GENERIC_ERROR;
+				}
+				if (fseek(fh, 0,SEEK_END) == -1) {
+					perror("fseek");
+					fclose(fh);
+					return GETDNS_RETURN_GENERIC_ERROR;
+				}
+				config_file_sz = ftell(fh);
+				if (config_file_sz <= 0) {
+					/* Empty config is no config */
+					fclose(fh);
+					break;
+				}
+				if (!(config_file=malloc(config_file_sz + 1))){
+					fclose(fh);
+					fprintf(stderr, "Could not allocate me"
+					    "mory for \"%s\"\n", argv[i]);
+					return GETDNS_RETURN_MEMORY_ERROR;
+				}
+				rewind(fh);
+				if (fread(config_file, 1, config_file_sz, fh)
+				    != config_file_sz) {
+					fprintf(stderr, "An error occurred whil"
+					    "e reading \"%s\": %s\n",argv[i],
+					    strerror(errno));
+					fclose(fh);
+					return GETDNS_RETURN_MEMORY_ERROR;
+				}
+				config_file[config_file_sz] = 0;
+				fclose(fh);
+				parse_config(config_file);
+				free(config_file);
+				config_file = NULL;
+				break;
 			case 'D':
 				(void) getdns_context_set_edns_do_bit(context, 1);
 				break;
@@ -1121,7 +1861,29 @@ getdns_return_t parse_args(int argc, char **argv)
 				batch_mode = 1;
 				break;
 
-
+			case 'z':
+				if (c[1] != 0 || ++i >= argc || !*argv[i]) {
+					fprintf(stderr, "listed address "
+					                "expected after -z\n");
+					return GETDNS_RETURN_GENERIC_ERROR;
+				}
+				getdns_dict *downstream =
+				    ipaddr_dict(context, argv[i]);
+				if (!downstream) {
+					fprintf(stderr, "could not parse "
+					        "listen address: %s", argv[i]);
+				}
+				if (!listen_list &&
+				    !(listen_list =
+				    getdns_list_create_with_context(context))){
+					fprintf(stderr, "Could not create "
+							"downstram list\n");
+					return GETDNS_RETURN_MEMORY_ERROR;
+				}
+				getdns_list_set_dict(listen_list,
+				    listen_count++, downstream);
+				getdns_dict_destroy(downstream);
+				break;
 			default:
 				fprintf(stderr, "Unknown option "
 				    "\"%c\"\n", *c);
@@ -1313,6 +2075,656 @@ void read_line_cb(void *userarg)
 	}
 }
 
+typedef struct listen_data {
+	socklen_t                addr_len;
+	struct sockaddr_storage  addr;
+	int                      fd;
+	getdns_transport_list_t  transport;
+	getdns_eventloop_event   event;
+} listen_data;
+
+
+listen_data *listening = NULL;
+
+typedef struct dns_msg {
+	listen_data         *ld;
+	getdns_dict         *query;
+	uint32_t             rt;
+	uint32_t             do_bit;
+	uint32_t             cd_bit;
+} dns_msg;
+
+typedef struct udp_msg {
+	dns_msg                 super;
+	struct sockaddr_storage remote_in;
+	socklen_t               addrlen;
+} udp_msg;
+
+typedef struct tcp_to_write tcp_to_write;
+struct tcp_to_write {
+	size_t        write_buf_len;
+	size_t        written;
+	tcp_to_write *next;
+	uint8_t       write_buf[];
+};
+
+#define DOWNSTREAM_IDLE_TIMEOUT 5000
+typedef struct downstream {
+	listen_data            *ld;
+	struct sockaddr_storage remote_in;
+	socklen_t               addrlen;
+	int                     fd;
+	getdns_eventloop_event  event;
+
+	uint8_t                *read_buf;
+	size_t                  read_buf_len;
+	uint8_t                *read_pos;
+	size_t                  to_read;
+
+	tcp_to_write           *to_write;
+	size_t                  to_answer;
+} downstream;
+
+typedef struct tcp_msg {
+	dns_msg     super;
+	downstream *conn;
+} tcp_msg;
+
+void downstream_destroy(downstream *conn)
+{
+	tcp_to_write *cur, *next;
+
+	if (conn->event.read_cb||conn->event.write_cb||conn->event.timeout_cb)
+		my_eventloop_clear(&my_loop.base, &conn->event);
+	if (conn->fd >= 0) {
+		if (close(conn->fd) == -1)
+			perror("close");
+	}
+	free(conn->read_buf);
+	for (cur = conn->to_write; cur; cur = next) {
+		next = cur->next;
+		free(cur);
+	}
+	free(conn);
+}
+
+void tcp_write_cb(void *userarg)
+{
+	downstream *conn = (downstream *)userarg;
+	tcp_to_write *to_write;
+	ssize_t written;
+
+	assert(userarg);
+
+	/* Reset downstream idle timeout */
+	my_eventloop_clear(&my_loop.base, &conn->event);
+	
+	if (!conn->to_write) {
+		conn->event.write_cb = NULL;
+		(void) my_eventloop_schedule(&my_loop.base, conn->fd,
+		    DOWNSTREAM_IDLE_TIMEOUT, &conn->event);
+		return;
+	}
+	to_write = conn->to_write;
+	if ((written = write(conn->fd, &to_write->write_buf[to_write->written],
+	    to_write->write_buf_len - to_write->written)) == -1) {
+
+		perror("write");
+		conn->event.read_cb = conn->event.write_cb =
+		    conn->event.timeout_cb = NULL;
+		downstream_destroy(conn);
+		return;
+	}
+	to_write->written += written;
+	if (to_write->written == to_write->write_buf_len) {
+		conn->to_write = to_write->next;
+		free(to_write);
+	}
+	if (!conn->to_write)
+		conn->event.write_cb = NULL;
+	(void) my_eventloop_schedule(&my_loop.base, conn->fd,
+	    DOWNSTREAM_IDLE_TIMEOUT, &conn->event);
+}
+
+#if defined(TRACE_DEBUG) && TRACE_DEBUG
+#define SERVFAIL(error,r,msg,resp_p) do { \
+	if (r)	DEBUG_TRACE("%s: %s\n", error, getdns_get_errorstr_by_id(r)); \
+	else	DEBUG_TRACE("%s\n", error); \
+	servfail(msg, resp_p); \
+	} while (0)
+#else
+#define SERVFAIL(error,r,msg,resp_p) servfail(msg, resp_p)
+#endif
+
+void servfail(dns_msg *msg, getdns_dict **resp_p)
+{
+	getdns_dict *dict;
+
+	if (*resp_p)
+		getdns_dict_destroy(*resp_p);
+	if (!(*resp_p = getdns_dict_create()))
+		return;
+	if (!getdns_dict_get_dict(msg->query, "header", &dict))
+		getdns_dict_set_dict(*resp_p, "header", dict);
+	if (!getdns_dict_get_dict(msg->query, "question", &dict));
+		getdns_dict_set_dict(*resp_p, "question", dict);
+	(void) getdns_dict_set_int(
+	    *resp_p, "/header/rcode", GETDNS_RCODE_SERVFAIL);
+	(void) getdns_dict_set_int(*resp_p, "/header/qr", 1);
+	(void) getdns_dict_set_int(*resp_p, "/header/ad", 0);
+	(void) getdns_dict_set_int(*resp_p, "/header/ra",
+	    msg->rt == GETDNS_RESOLUTION_RECURSING ? 1 : 0);
+}
+
+void request_cb(getdns_context *context, getdns_callback_type_t callback_type,
+    getdns_dict *response, void *userarg, getdns_transaction_t transaction_id)
+{
+	dns_msg *msg = (dns_msg *)userarg;
+	uint32_t qid;
+	getdns_return_t r = GETDNS_RETURN_GOOD;
+	uint8_t buf[65536];
+	size_t len = sizeof(buf);
+	uint32_t n;
+
+	DEBUG_TRACE("reply for: %p %"PRIu64" %d\n", msg, transaction_id, (int)callback_type);
+	assert(msg);
+
+#if 0
+	fprintf(stderr, "reply: %s\n", getdns_pretty_print_dict(response));
+#endif
+
+	if (callback_type != GETDNS_CALLBACK_COMPLETE)
+		SERVFAIL("Callback type not complete",
+		    callback_type, msg, &response);
+
+	else if (!response)
+		SERVFAIL("Missing response", 0, msg, &response);
+
+	else if ((r = getdns_dict_get_int(msg->query, "/header/id", &qid)) ||
+	    (r=getdns_dict_set_int(response,"/replies_tree/0/header/id",qid)))
+		SERVFAIL("Could not copy QID", r, msg, &response);
+
+	else if (getdns_dict_get_int(
+	    response, "/replies_tree/0/header/rcode", &n))
+		SERVFAIL("No reply in replies tree", 0, msg, &response);
+
+	else if (msg->cd_bit != 1 && !getdns_dict_get_int(
+	    response, "/replies_tree/0/dnssec_status", &n)
+	    && n == GETDNS_DNSSEC_BOGUS)
+		SERVFAIL("DNSSEC status was bogus", 0, msg, &response);
+
+	else if ((r = getdns_dict_get_int(
+	    response, "/replies_tree/0/header/rcode", &n)))
+		SERVFAIL("Could not get rcode from reply", r, msg, &response);
+
+	else if (n == GETDNS_RCODE_SERVFAIL)
+		servfail(msg, &response);
+
+	else if (msg->rt == GETDNS_RESOLUTION_STUB)
+		; /* following checks are for RESOLUTION_RECURSING only */
+	
+	else if ((r =  getdns_dict_set_int(
+	    response, "/replies_tree/0/header/cd", msg->cd_bit)))
+		SERVFAIL("Could not copy CD bit", r, msg, &response);
+
+	else if ((r = getdns_dict_get_int(
+	    response, "/replies_tree/0/header/ra", &n)))
+		SERVFAIL("Could not get RA bit from reply", r, msg, &response);
+
+	else if (n == 0)
+		SERVFAIL("Recursion not available", 0, msg, &response);
+
+	if (!response)
+		; /* No response, no reply */
+
+	else if ((r = getdns_msg_dict2wire_buf(response, buf, &len)))
+		fprintf(stderr, "Could not convert reply: %s\n",
+		    getdns_get_errorstr_by_id(r));
+
+	else if (msg->ld->transport == GETDNS_TRANSPORT_UDP) {
+		udp_msg *msg = (udp_msg *)userarg;
+
+		if (sendto(msg->super.ld->fd, buf, len, 0,
+		    (struct sockaddr *)&msg->remote_in, msg->addrlen) == -1)
+			perror("sendto");
+
+	} else if (msg->ld->transport == GETDNS_TRANSPORT_TCP) {
+		tcp_msg *msg = (tcp_msg *)userarg;
+		tcp_to_write **to_write_p;
+		tcp_to_write *to_write = malloc(sizeof(tcp_to_write) + len + 2);
+
+		if (!to_write) 
+			fprintf(stderr, "Could not allocate memory for"
+					"message to write on tcp stream\n");
+		else {
+			to_write->write_buf_len = len + 2;
+			to_write->write_buf[0] = (len >> 8) & 0xFF;
+			to_write->write_buf[1] = len & 0xFF;
+			to_write->written = 0;
+			to_write->next = NULL;
+			(void) memcpy(to_write->write_buf + 2, buf, len);
+
+			/* Appen to_write to conn->to_write list */
+			for ( to_write_p = &msg->conn->to_write
+			    ; *to_write_p
+			    ; to_write_p = &(*to_write_p)->next)
+				; /* pass */
+			*to_write_p = to_write;
+
+			my_eventloop_clear(&my_loop.base, &msg->conn->event);
+			msg->conn->event.write_cb = tcp_write_cb;
+			(void) my_eventloop_schedule(&my_loop.base,
+			    msg->conn->fd, DOWNSTREAM_IDLE_TIMEOUT,
+			    &msg->conn->event);
+		}
+	}
+	if (msg) {
+		getdns_dict_destroy(msg->query);
+		free(msg);
+	}
+	if (response)
+		getdns_dict_destroy(response);
+}	
+
+getdns_return_t schedule_request(dns_msg *msg)
+{
+	getdns_bindata *qname;
+	char *qname_str = NULL;
+	uint32_t qtype;
+	getdns_return_t r;
+	getdns_dict *header;
+	uint32_t n;
+	getdns_list *list;
+	getdns_transaction_t transaction_id;
+	getdns_dict *qext;
+
+	if (!query_extensions_spc &&
+	    !(query_extensions_spc = getdns_dict_create()))
+		fprintf(stderr, "Could not create query extensions space\n");
+
+	else if ((r = getdns_dict_set_dict(
+	    query_extensions_spc, "qext", extensions)))
+		fprintf(stderr, "Could not copy extensions in query extensions"
+		                " space: %s\n", getdns_get_errorstr_by_id(r));
+
+	else if ((r = getdns_dict_get_dict(query_extensions_spc,"qext",&qext)))
+		fprintf(stderr, "Could not get query extensions from space: %s"
+		              , getdns_get_errorstr_by_id(r));
+
+	/* pass through the header and the OPT record */
+	n = 0;
+	msg->do_bit = msg->cd_bit = 0;
+	msg->rt = GETDNS_RESOLUTION_STUB;
+	(void) getdns_dict_get_int(msg->query, "/additional/0/do", &msg->do_bit);
+	(void) getdns_dict_get_int(msg->query, "/header/cd", &msg->cd_bit);
+	if ((r = getdns_context_get_resolution_type(context, &msg->rt)))
+		fprintf(stderr, "Could get resolution type from context: %s\n",
+		    getdns_get_errorstr_by_id(r));
+
+	if (msg->rt == GETDNS_RESOLUTION_STUB) {
+		(void)getdns_dict_set_int(
+		    qext , "/add_opt_parameters/do_bit", msg->do_bit);
+		if (!getdns_dict_get_dict(msg->query, "header", &header))
+			(void)getdns_dict_set_dict(qext, "header", header);
+
+	} else if (getdns_dict_get_int(extensions,"dnssec_return_status",&n) ||
+	    n == GETDNS_EXTENSION_FALSE)
+		(void)getdns_dict_set_int(qext, "dnssec_return_status",
+		    msg->do_bit ? GETDNS_EXTENSION_TRUE : GETDNS_EXTENSION_FALSE);
+
+	if (!getdns_dict_get_int(qext, "dnssec_return_status", &n) &&
+	    n == GETDNS_EXTENSION_TRUE)
+		(void) getdns_dict_set_int(qext, "dnssec_return_all_statuses",
+		    msg->cd_bit ? GETDNS_EXTENSION_TRUE : GETDNS_EXTENSION_FALSE);
+
+	if (!getdns_dict_get_int(msg->query,"/additional/0/extended_rcode",&n))
+		(void)getdns_dict_set_int(
+		    qext, "/add_opt_parameters/extended_rcode", n);
+
+	if (!getdns_dict_get_int(msg->query, "/additional/0/version", &n))
+		(void)getdns_dict_set_int(
+		    qext, "/add_opt_parameters/version", n);
+
+	if (!getdns_dict_get_int(
+	    msg->query, "/additional/0/udp_payload_size", &n))
+		(void)getdns_dict_set_int(qext,
+		    "/add_opt_parameters/maximum_udp_payload_size", n);
+
+	if (!getdns_dict_get_list(
+	    msg->query, "/additional/0/rdata/options", &list))
+		(void)getdns_dict_set_list(qext,
+		    "/add_opt_parameters/options", list);
+
+#if 0
+	do {
+		char *str = getdns_pretty_print_dict(msg->query);
+		fprintf(stderr, "query: %s\n", str);
+		free(str);
+		str = getdns_pretty_print_dict(qext);
+		fprintf(stderr, "query with extensions: %s\n", str);
+		free(str);
+	} while (0);
+#endif
+	if ((r = getdns_dict_get_bindata(msg->query,"/question/qname",&qname)))
+		fprintf(stderr, "Could not get qname from query: %s\n",
+		    getdns_get_errorstr_by_id(r));
+
+	else if ((r = getdns_convert_dns_name_to_fqdn(qname, &qname_str)))
+		fprintf(stderr, "Could not convert qname: %s\n",
+		    getdns_get_errorstr_by_id(r));
+
+	else if ((r=getdns_dict_get_int(msg->query,"/question/qtype",&qtype)))
+		fprintf(stderr, "Could get qtype from query: %s\n",
+		    getdns_get_errorstr_by_id(r));
+
+	else if ((r = getdns_general(context, qname_str, qtype,
+	    qext, msg, &transaction_id, request_cb)))
+		fprintf(stderr, "Could not schedule query: %s\n",
+		    getdns_get_errorstr_by_id(r));
+
+	DEBUG_TRACE("scheduled: %p %"PRIu64" for %s %d\n",
+	    msg, transaction_id, qname_str, (int)qtype);
+	free(qname_str);
+
+	return r;
+}
+
+void tcp_read_cb(void *userarg)
+{
+	downstream *conn = (downstream *)userarg;
+	ssize_t bytes_read;
+	tcp_msg *msg;
+	getdns_return_t r;
+
+	assert(userarg);
+
+	/* Reset downstream idle timeout */
+	my_eventloop_clear(&my_loop.base, &conn->event);
+	(void) my_eventloop_schedule(&my_loop.base, conn->fd,
+	    DOWNSTREAM_IDLE_TIMEOUT, &conn->event);
+
+	if ((bytes_read = read(conn->fd, conn->read_pos, conn->to_read)) == -1) {
+		if (errno == EAGAIN || errno == EWOULDBLOCK)
+			return;
+		perror("read");
+		downstream_destroy(conn);
+		return;
+	}
+	if (bytes_read == 0) {
+		/* fprintf(stderr, "Remote end closed connection\n"); */
+		downstream_destroy(conn);
+		return;
+	}
+	assert(bytes_read <= conn->to_read);
+
+	conn->to_read  -= bytes_read;
+	conn->read_pos += bytes_read;
+	if (conn->to_read)
+		return; /* More to read */
+
+	if (conn->read_pos - conn->read_buf == 2) {
+		/* read length of dns msg to read */
+		conn->to_read = (conn->read_buf[0] << 8) | conn->read_buf[1];
+		if (conn->to_read > conn->read_buf_len) {
+			free(conn->read_buf);
+			while (conn->to_read > conn->read_buf_len)
+				conn->read_buf_len *= 2;
+			if (!(conn->read_buf = malloc(conn->read_buf_len))) {
+				fprintf(stderr, "Could not enlarge "
+				                "downstream read buffer\n");
+				downstream_destroy(conn);
+				return;
+			}
+		}
+		if (conn->to_read < 12) {
+			fprintf(stderr, "Request smaller than DNS header\n");
+			downstream_destroy(conn);
+			return;
+		}
+		conn->read_pos = conn->read_buf;
+		return;  /* Read DNS message */
+	}
+	if (!(msg = malloc(sizeof(tcp_msg)))) {
+		fprintf(stderr, "Could not allocate tcp_msg\n");
+		downstream_destroy(conn);
+		return;
+	}
+	msg->super.ld = conn->ld;
+	msg->conn = conn;
+	if ((r = getdns_wire2msg_dict(conn->read_buf,
+	    (conn->read_pos - conn->read_buf), &msg->super.query)))
+		fprintf(stderr, "Error converting query dns msg: %s\n",
+		    getdns_get_errorstr_by_id(r));
+
+	else if ((r = schedule_request(&msg->super))) {
+		fprintf(stderr, "Error scheduling query: %s\n",
+		    getdns_get_errorstr_by_id(r));
+
+		getdns_dict_destroy(msg->super.query);
+	} else {
+		conn->to_answer += 1;
+		conn->read_pos = conn->read_buf;
+		conn->to_read = 2;
+		return; /* Read more requests */
+	}
+	free(msg);
+	conn->read_pos = conn->read_buf;
+	conn->to_read = 2;
+	 /* Read more requests */
+}
+
+void tcp_timeout_cb(void *userarg)
+{
+	downstream *conn = (downstream *)userarg;
+
+	assert(userarg);
+
+	downstream_destroy(conn);
+}
+
+void tcp_accept_cb(void *userarg)
+{
+	listen_data *ld = (listen_data *)userarg;
+	downstream *conn;
+
+	assert(userarg);
+
+	if (!(conn = malloc(sizeof(downstream))))
+		return;
+
+	(void) memset(conn, 0, sizeof(downstream));
+
+	conn->ld = ld;
+	conn->addrlen = sizeof(conn->remote_in);
+	if ((conn->fd = accept(ld->fd,
+	    (struct sockaddr *)&conn->remote_in, &conn->addrlen)) == -1) {
+		perror("accept");
+		free(conn);
+	}
+	if (!(conn->read_buf = malloc(4096))) {
+		fprintf(stderr, "Could not allocate downstream read buffer.\n");
+		free(conn);
+	}
+	conn->read_buf_len = 4096;
+	conn->read_pos = conn->read_buf;
+	conn->to_read = 2;
+	conn->event.userarg = conn;
+	conn->event.read_cb = tcp_read_cb;
+	conn->event.timeout_cb = tcp_timeout_cb;
+	(void) my_eventloop_schedule(&my_loop.base, conn->fd,
+	    DOWNSTREAM_IDLE_TIMEOUT, &conn->event);
+}
+
+void udp_read_cb(void *userarg)
+{
+	listen_data *ld = (listen_data *)userarg;
+	udp_msg *msg;
+	uint8_t buf[65536];
+	ssize_t len;
+	getdns_return_t r;
+	
+	assert(userarg);
+
+	if (!(msg = malloc(sizeof(udp_msg))))
+		return;
+
+	msg->super.ld = ld;
+	msg->addrlen = sizeof(msg->remote_in);
+	if ((len = recvfrom(ld->fd, buf, sizeof(buf), 0,
+	    (struct sockaddr *)&msg->remote_in, &msg->addrlen)) == -1)
+		perror("recvfrom");
+
+	else if ((r = getdns_wire2msg_dict(buf, len, &msg->super.query)))
+		fprintf(stderr, "Error converting query dns msg: %s\n",
+		    getdns_get_errorstr_by_id(r));
+
+	else if ((r = schedule_request(&msg->super))) {
+		fprintf(stderr, "Error scheduling query: %s\n",
+		    getdns_get_errorstr_by_id(r));
+
+		getdns_dict_destroy(msg->super.query);
+	} else
+		return;
+	free(msg);
+}
+
+getdns_return_t start_daemon()
+{
+	static const getdns_transport_list_t listen_transports[]
+		= { GETDNS_TRANSPORT_UDP, GETDNS_TRANSPORT_TCP };
+	static const uint32_t transport_ports[] = { 53, 53 };
+	static const size_t n_transports = sizeof( listen_transports)
+	                                 / sizeof(*listen_transports);
+
+	size_t i;
+	size_t t;
+	struct addrinfo hints;
+	getdns_return_t r = GETDNS_RETURN_GOOD;
+	char addrstr[1024], portstr[1024], *eos;
+	const int enable = 1; /* For SO_REUSEADDR */
+
+	if (!listen_count)
+		return GETDNS_RETURN_GOOD;
+
+	if (!(listening = malloc(
+	    sizeof(listen_data) * n_transports * listen_count)))
+		return GETDNS_RETURN_MEMORY_ERROR;
+
+	(void) memset(listening, 0,
+	    sizeof(listen_data) * n_transports * listen_count);
+	(void) memset(&hints, 0, sizeof(struct addrinfo));
+	hints.ai_family    = AF_UNSPEC;
+	hints.ai_flags     = AI_NUMERICHOST;
+
+	for (i = 0; !r && i < listen_count; i++) {
+		getdns_dict    *dict = NULL;
+		getdns_bindata *address_data;
+		struct sockaddr_storage  addr;
+		getdns_bindata  *scope_id;
+
+		if ((r = getdns_list_get_dict(listen_list, i, &dict))) {
+			if ((r = getdns_list_get_bindata(
+			    listen_list, i, &address_data)))
+				break;
+		} else if ((r = getdns_dict_get_bindata(
+		    dict, "address_data", &address_data)))
+			break;
+		if (address_data->size == 4)
+			addr.ss_family = AF_INET;
+		else if (address_data->size == 16)
+			addr.ss_family = AF_INET6;
+		else {
+			r = GETDNS_RETURN_INVALID_PARAMETER;
+			break;
+		}
+		if (inet_ntop(addr.ss_family,
+		    address_data->data, addrstr, 1024) == NULL) {
+			r = GETDNS_RETURN_INVALID_PARAMETER;
+			break;
+		}
+		if (dict && getdns_dict_get_bindata(dict,"scope_id",&scope_id)
+		    == GETDNS_RETURN_GOOD) {
+			if (strlen(addrstr) + scope_id->size > 1022) {
+				r = GETDNS_RETURN_INVALID_PARAMETER;
+				break;
+			}
+			eos = &addrstr[strlen(addrstr)];
+			*eos++ = '%';
+			(void) memcpy(eos, scope_id->data, scope_id->size);
+			eos[scope_id->size] = 0;
+		}
+		for (t = 0; !r && t < n_transports; t++) {
+			getdns_transport_list_t transport
+			    = listen_transports[t];
+			uint32_t port = transport_ports[t];
+			struct addrinfo *ai;
+			listen_data *ld = &listening[i * n_transports + t];
+
+			ld->fd = -1;
+			if (dict)
+				(void) getdns_dict_get_int(dict,
+				    ( transport == GETDNS_TRANSPORT_TLS
+				    ? "tls_port" : "port" ), &port);
+
+			(void) snprintf(portstr, 1024, "%d", (int)port);
+
+			if (getaddrinfo(addrstr, portstr, &hints, &ai)) {
+				r = GETDNS_RETURN_INVALID_PARAMETER;
+				break;
+			}
+			if (!ai)
+				continue;
+
+			ld->addr.ss_family = addr.ss_family;
+			ld->addr_len = ai->ai_addrlen;
+			(void) memcpy(&ld->addr, ai->ai_addr, ai->ai_addrlen);
+			ld->transport = transport;
+			freeaddrinfo(ai);
+		}
+
+	}
+	if (r) {
+		free(listening);
+		listening = NULL;
+	} else for (i = 0; !r && i < listen_count * n_transports; i++) {
+		listen_data *ld = &listening[i];
+
+		if (ld->transport != GETDNS_TRANSPORT_UDP &&
+		    ld->transport != GETDNS_TRANSPORT_TCP)
+			continue;
+
+		if ((ld->fd = socket(ld->addr.ss_family,
+		    ( ld->transport == GETDNS_TRANSPORT_UDP
+		    ? SOCK_DGRAM : SOCK_STREAM), 0)) == -1)
+			perror("socket");
+
+		else if (setsockopt(ld->fd, SOL_SOCKET, SO_REUSEADDR,
+		    &enable, sizeof(int)) < 0)
+			perror("setsockopt(SO_REUSEADDR) failed");
+
+		else if (bind(ld->fd, (struct sockaddr *)&ld->addr,
+		    ld->addr_len) == -1)
+			perror("bind");
+
+		else if (ld->transport == GETDNS_TRANSPORT_UDP) {
+			ld->event.userarg = ld;
+			ld->event.read_cb = udp_read_cb;
+			(void) my_eventloop_schedule(
+			    &my_loop.base, ld->fd, -1, &ld->event);
+
+		} else if (listen(ld->fd, 16) == -1)
+			perror("listen");
+
+		else {
+			ld->event.userarg = ld;
+			ld->event.read_cb = tcp_accept_cb;
+			(void) my_eventloop_schedule(
+			    &my_loop.base, ld->fd, -1, &ld->event);
+		}
+	}
+	return r;
+}
+
 int
 main(int argc, char **argv)
 {
@@ -1344,6 +2756,11 @@ main(int argc, char **argv)
 	} else
 		fp = stdin;
 
+	if (listen_count || interactive) {
+		if ((r = getdns_context_set_eventloop(context, &my_loop.base)))
+			goto done_destroy_context;
+	}
+	start_daemon();
 	/* Make the call */
 	if (interactive) {
 
@@ -1351,8 +2768,6 @@ main(int argc, char **argv)
 		    &read_line_ev, read_line_cb, NULL, NULL, NULL };
 		(void) my_eventloop_schedule(
 		    &my_loop.base, fileno(fp), -1, &read_line_ev);
-		if ((r = getdns_context_set_eventloop(context, &my_loop.base)))
-			goto done_destroy_context;
 
 		if (!query_file) {
 			printf("> ");
@@ -1360,6 +2775,8 @@ main(int argc, char **argv)
 		}
 		my_eventloop_run(&my_loop.base);
 	}
+	else if (listen_count)
+		my_eventloop_run(&my_loop.base);
 	else
 		r = do_the_call();
 
diff --git a/src/test/jsmn b/src/test/jsmn
new file mode 160000
index 00000000..daa17063
--- /dev/null
+++ b/src/test/jsmn
@@ -0,0 +1 @@
+Subproject commit daa17063c67f0dfe873af25ab6b664641c8cf90c
diff --git a/src/test/tpkg/260-conversion-functions.tpkg/260-conversion-functions.good b/src/test/tpkg/260-conversion-functions.tpkg/260-conversion-functions.good
index f6c4f2a7..47278b10 100644
--- a/src/test/tpkg/260-conversion-functions.tpkg/260-conversion-functions.good
+++ b/src/test/tpkg/260-conversion-functions.tpkg/260-conversion-functions.good
@@ -1,6 +1,6 @@
 {
   "class": GETDNS_RRCLASS_IN,
-  "name": <bindata of "some.domain.tld.">,
+  "name": <bindata for some.domain.tld.>,
   "rdata":
   {
     "rdata_raw": <bindata of 0x0c666972737420737472696e67067365...>,
@@ -39,7 +39,7 @@ www.getdnsapi.net.	0	IN	A	185.49.141.37
 
 {
   "class": GETDNS_RRCLASS_IN,
-  "name": <bindata of "hip2.nlnetlabs.nl.">,
+  "name": <bindata for hip2.nlnetlabs.nl.>,
   "rdata":
   {
     "hit": <bindata of 0x200100107b1a74df365639cc39f1d578>,
@@ -47,8 +47,8 @@ www.getdnsapi.net.	0	IN	A	185.49.141.37
     "public_key": <bindata of 0x03010001b771ca136e4aeb5ce44333c5...>,
     "rendezvous_servers":
     [
-       <bindata of "rvs1.example.com.">,
-       <bindata of "rvs2.example.com.">
+       <bindata for rvs1.example.com.>,
+       <bindata for rvs2.example.com.>
     ]
   },
   "ttl": 3600,
@@ -59,7 +59,7 @@ hip0.nlnetlabs.nl.	3600	IN	HIP	2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSu
 
 {
   "class": GETDNS_RRCLASS_IN,
-  "name": <bindata of "apl.net-dns.org.">,
+  "name": <bindata for apl.net-dns.org.>,
   "rdata":
   {
     "apitems":
@@ -103,16 +103,16 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
 [
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "net-dns.org.">,
+    "name": <bindata for net-dns.org.>,
     "rdata":
     {
       "expire": 345600,
       "minimum": 300,
-      "mname": <bindata of "ns.nlnetlabs.nl.">,
+      "mname": <bindata for ns.nlnetlabs.nl.>,
       "rdata_raw": <bindata of 0x026e73096e6c6e65746c616273026e6c...>,
       "refresh": 450,
       "retry": 600,
-      "rname": <bindata of "sysadmin.nlnetlabs.nl.">,
+      "rname": <bindata for sysadmin.nlnetlabs.nl.>,
       "serial": 2015081800
     },
     "ttl": 30,
@@ -120,51 +120,51 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "net-dns.org.">,
+    "name": <bindata for net-dns.org.>,
     "rdata":
     {
-      "nsdname": <bindata of "ns.nlnetlabs.nl.">,
-      "rdata_raw": <bindata of "ns.nlnetlabs.nl.">
+      "nsdname": <bindata for ns.nlnetlabs.nl.>,
+      "rdata_raw": <bindata for ns.nlnetlabs.nl.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_NS
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "net-dns.org.">,
+    "name": <bindata for net-dns.org.>,
     "rdata":
     {
-      "nsdname": <bindata of "ns.hactrn.net.">,
-      "rdata_raw": <bindata of "ns.hactrn.net.">
+      "nsdname": <bindata for ns.hactrn.net.>,
+      "rdata_raw": <bindata for ns.hactrn.net.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_NS
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "net-dns.org.">,
+    "name": <bindata for net-dns.org.>,
     "rdata":
     {
-      "nsdname": <bindata of "mcvax.nlnet.nl.">,
-      "rdata_raw": <bindata of "mcvax.nlnet.nl.">
+      "nsdname": <bindata for mcvax.nlnet.nl.>,
+      "rdata_raw": <bindata for mcvax.nlnet.nl.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_NS
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "net-dns.org.">,
+    "name": <bindata for net-dns.org.>,
     "rdata":
     {
-      "nsdname": <bindata of "sec2.authdns.ripe.net.">,
-      "rdata_raw": <bindata of "sec2.authdns.ripe.net.">
+      "nsdname": <bindata for sec2.authdns.ripe.net.>,
+      "rdata_raw": <bindata for sec2.authdns.ripe.net.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_NS
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "net-dns.org.">,
+    "name": <bindata for net-dns.org.>,
     "rdata":
     {
       "ipv4_address": <bindata for 185.49.140.22>,
@@ -175,7 +175,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "net-dns.org.">,
+    "name": <bindata for net-dns.org.>,
     "rdata":
     {
       "ipv6_address": <bindata for 2a04:b900::2:0:0:22>,
@@ -186,10 +186,10 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "net-dns.org.">,
+    "name": <bindata for net-dns.org.>,
     "rdata":
     {
-      "exchange": <bindata of "dicht.nlnetlabs.nl.">,
+      "exchange": <bindata for dicht.nlnetlabs.nl.>,
       "preference": 10,
       "rdata_raw": <bindata of 0x000a056469636874096e6c6e65746c61...>
     },
@@ -198,10 +198,10 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "net-dns.org.">,
+    "name": <bindata for net-dns.org.>,
     "rdata":
     {
-      "exchange": <bindata of "mcvax.nlnet.nl.">,
+      "exchange": <bindata for mcvax.nlnet.nl.>,
       "preference": 20,
       "rdata_raw": <bindata of 0x0014056d63766178056e6c6e6574026e...>
     },
@@ -210,7 +210,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "net-dns.org.">,
+    "name": <bindata for net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x104e65743a3a444e532020646f6d6169...>,
@@ -224,7 +224,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "_443._tcp.net-dns.org.">,
+    "name": <bindata for _443._tcp.net-dns.org.>,
     "rdata":
     {
       "certificate_association_data": <bindata of 0x274c6f96c9885c8050e8a05ad1c3162c...>,
@@ -238,7 +238,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "_443._tcp.www.net-dns.org.">,
+    "name": <bindata for _443._tcp.www.net-dns.org.>,
     "rdata":
     {
       "certificate_association_data": <bindata of 0x274c6f96c9885c8050e8a05ad1c3162c...>,
@@ -252,7 +252,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "dynup.net-dns.org.">,
+    "name": <bindata for dynup.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x07666f6f466f6f3209426c61203b2046...>,
@@ -267,7 +267,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "lists.net-dns.org.">,
+    "name": <bindata for lists.net-dns.org.>,
     "rdata":
     {
       "ipv4_address": <bindata for 63.209.15.196>,
@@ -278,7 +278,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "localhost.net-dns.org.">,
+    "name": <bindata for localhost.net-dns.org.>,
     "rdata":
     {
       "ipv4_address": <bindata for 127.0.0.1>,
@@ -289,7 +289,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3e416e64206c696e652031206f662061...>,
@@ -303,7 +303,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3e416e64206c696e652032206f662061...>,
@@ -317,7 +317,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3e416e64206c696e652033206f662061...>,
@@ -331,7 +331,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3e416e64206c696e652034206f662061...>,
@@ -345,7 +345,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3e416e64206c696e652035206f662061...>,
@@ -359,7 +359,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3e416e64206c696e652036206f662061...>,
@@ -373,7 +373,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3e416e64206c696e652037206f662061...>,
@@ -387,7 +387,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3e416e64206c696e652038206f662061...>,
@@ -401,7 +401,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3e416e64206c696e652039206f662061...>,
@@ -415,7 +415,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203130206f6620...>,
@@ -429,7 +429,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203131206f6620...>,
@@ -443,7 +443,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203132206f6620...>,
@@ -457,7 +457,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203133206f6620...>,
@@ -471,7 +471,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203134206f6620...>,
@@ -485,7 +485,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203135206f6620...>,
@@ -499,7 +499,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203136206f6620...>,
@@ -513,7 +513,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203137206f6620...>,
@@ -527,7 +527,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203138206f6620...>,
@@ -541,7 +541,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203139206f6620...>,
@@ -555,7 +555,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203230206f6620...>,
@@ -569,7 +569,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203231206f6620...>,
@@ -583,7 +583,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203232206f6620...>,
@@ -597,7 +597,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203233206f6620...>,
@@ -611,7 +611,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203235206f6620...>,
@@ -625,7 +625,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203236206f6620...>,
@@ -639,7 +639,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203237206f6620...>,
@@ -653,7 +653,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203238206f6620...>,
@@ -667,7 +667,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203239206f6620...>,
@@ -681,7 +681,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203330206f6620...>,
@@ -695,7 +695,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203331206f6620...>,
@@ -709,7 +709,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203332206f6620...>,
@@ -723,7 +723,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203333206f6620...>,
@@ -737,7 +737,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203334206f6620...>,
@@ -751,7 +751,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203335206f6620...>,
@@ -765,7 +765,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203336206f6620...>,
@@ -779,7 +779,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203337206f6620...>,
@@ -793,7 +793,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203338206f6620...>,
@@ -807,7 +807,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203339206f6620...>,
@@ -821,7 +821,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203430206f6620...>,
@@ -835,7 +835,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203431206f6620...>,
@@ -849,7 +849,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203432206f6620...>,
@@ -863,7 +863,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203433206f6620...>,
@@ -877,7 +877,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203434206f6620...>,
@@ -891,7 +891,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203435206f6620...>,
@@ -905,7 +905,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203436206f6620...>,
@@ -919,7 +919,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203437206f6620...>,
@@ -933,7 +933,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203438206f6620...>,
@@ -947,7 +947,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203439206f6620...>,
@@ -961,7 +961,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203530206f6620...>,
@@ -975,7 +975,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203531206f6620...>,
@@ -989,7 +989,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203532206f6620...>,
@@ -1003,7 +1003,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203533206f6620...>,
@@ -1017,7 +1017,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203534206f6620...>,
@@ -1031,7 +1031,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203535206f6620...>,
@@ -1045,7 +1045,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203536206f6620...>,
@@ -1059,7 +1059,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203537206f6620...>,
@@ -1073,7 +1073,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203538206f6620...>,
@@ -1087,7 +1087,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203539206f6620...>,
@@ -1101,7 +1101,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3f416e64206c696e65203630206f6620...>,
@@ -1115,7 +1115,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x40416e64206c696e6520323234206f66...>,
@@ -1129,7 +1129,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "overflow.net-dns.org.">,
+    "name": <bindata for overflow.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x45416e20696e637265616469626c7920...>,
@@ -1143,7 +1143,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "t.net-dns.org.">,
+    "name": <bindata for t.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x31546865206e616d6573207769746869...>,
@@ -1157,7 +1157,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "a.t.net-dns.org.">,
+    "name": <bindata for a.t.net-dns.org.>,
     "rdata":
     {
       "ipv4_address": <bindata for 10.0.1.128>,
@@ -1168,7 +1168,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "a2.t.net-dns.org.">,
+    "name": <bindata for a2.t.net-dns.org.>,
     "rdata":
     {
       "ipv4_address": <bindata for 10.0.1.129>,
@@ -1179,21 +1179,21 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "cname.t.net-dns.org.">,
+    "name": <bindata for cname.t.net-dns.org.>,
     "rdata":
     {
-      "cname": <bindata of "a.t.net-dns.org.">,
-      "rdata_raw": <bindata of "a.t.net-dns.org.">
+      "cname": <bindata for a.t.net-dns.org.>,
+      "rdata_raw": <bindata for a.t.net-dns.org.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_CNAME
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "mx.t.net-dns.org.">,
+    "name": <bindata for mx.t.net-dns.org.>,
     "rdata":
     {
-      "exchange": <bindata of "a.t.net-dns.org.">,
+      "exchange": <bindata for a.t.net-dns.org.>,
       "preference": 10,
       "rdata_raw": <bindata of 0x000a01610174076e65742d646e73036f...>
     },
@@ -1202,10 +1202,10 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "mx2.t.net-dns.org.">,
+    "name": <bindata for mx2.t.net-dns.org.>,
     "rdata":
     {
-      "exchange": <bindata of "a.t.net-dns.org.">,
+      "exchange": <bindata for a.t.net-dns.org.>,
       "preference": 10,
       "rdata_raw": <bindata of 0x000a01610174076e65742d646e73036f...>
     },
@@ -1214,10 +1214,10 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "mx2.t.net-dns.org.">,
+    "name": <bindata for mx2.t.net-dns.org.>,
     "rdata":
     {
-      "exchange": <bindata of "a2.t.net-dns.org.">,
+      "exchange": <bindata for a2.t.net-dns.org.>,
       "preference": 15,
       "rdata_raw": <bindata of 0x000f0261320174076e65742d646e7303...>
     },
@@ -1226,7 +1226,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "txt.t.net-dns.org.">,
+    "name": <bindata for txt.t.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x074e65742d444e53>,
@@ -1240,7 +1240,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "txt2.t.net-dns.org.">,
+    "name": <bindata for txt2.t.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x1a4e65742d444e533b20636f6d706c69...>,
@@ -1255,7 +1255,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "connection-test.t.net-dns.org.">,
+    "name": <bindata for connection-test.t.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x16636f6e6e656374696f6e2d74657374...>,
@@ -1269,7 +1269,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "txt-utf8.t.net-dns.org.">,
+    "name": <bindata for txt-utf8.t.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x09e58fa4e6b1a0e382840ce89b99e9a3...>,
@@ -1285,7 +1285,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "txt-utf8-bin.t.net-dns.org.">,
+    "name": <bindata for txt-utf8-bin.t.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x09e58fa4e6b1a0e382840ce89b99e9a3...>,
@@ -1301,7 +1301,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "a.few.empty.non.terminals.t.net-dns.org.">,
+    "name": <bindata for a.few.empty.non.terminals.t.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x01610366657705656d707479036e6f6e...>,
@@ -1319,7 +1319,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "a.few.empty.non.terminals.t.net-dns.org.">,
+    "name": <bindata for a.few.empty.non.terminals.t.net-dns.org.>,
     "rdata":
     {
       "ipv4_address": <bindata for 185.49.140.22>,
@@ -1330,7 +1330,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "a.few.empty.non.terminals.t.net-dns.org.">,
+    "name": <bindata for a.few.empty.non.terminals.t.net-dns.org.>,
     "rdata":
     {
       "ipv6_address": <bindata for 2a04:b900::2:0:0:22>,
@@ -1341,73 +1341,73 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "yx1.cname.t.net-dns.org.">,
+    "name": <bindata for yx1.cname.t.net-dns.org.>,
     "rdata":
     {
-      "cname": <bindata of "-.t.net-dns.org.">,
-      "rdata_raw": <bindata of "-.t.net-dns.org.">
+      "cname": <bindata for -.t.net-dns.org.>,
+      "rdata_raw": <bindata for -.t.net-dns.org.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_CNAME
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "yx2.cname.t.net-dns.org.">,
+    "name": <bindata for yx2.cname.t.net-dns.org.>,
     "rdata":
     {
-      "cname": <bindata of "a-a.t.net-dns.org.">,
-      "rdata_raw": <bindata of "a-a.t.net-dns.org.">
+      "cname": <bindata for a-a.t.net-dns.org.>,
+      "rdata_raw": <bindata for a-a.t.net-dns.org.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_CNAME
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "yx3.cname.t.net-dns.org.">,
+    "name": <bindata for yx3.cname.t.net-dns.org.>,
     "rdata":
     {
-      "cname": <bindata of "a\..t.net-dns.org.">,
-      "rdata_raw": <bindata of "a\..t.net-dns.org.">
+      "cname": <bindata for a\..t.net-dns.org.>,
+      "rdata_raw": <bindata for a\..t.net-dns.org.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_CNAME
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "yx4.cname.t.net-dns.org.">,
+    "name": <bindata for yx4.cname.t.net-dns.org.>,
     "rdata":
     {
-      "cname": <bindata of "a\000.t.net-dns.org.">,
-      "rdata_raw": <bindata of "a\000.t.net-dns.org.">
+      "cname": <bindata for a\000.t.net-dns.org.>,
+      "rdata_raw": <bindata for a\000.t.net-dns.org.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_CNAME
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "nx1.cname.t.net-dns.org.">,
+    "name": <bindata for nx1.cname.t.net-dns.org.>,
     "rdata":
     {
-      "cname": <bindata of "does.not.exist.t.net-dns.org.">,
-      "rdata_raw": <bindata of "does.not.exist.t.net-dns.org.">
+      "cname": <bindata for does.not.exist.t.net-dns.org.>,
+      "rdata_raw": <bindata for does.not.exist.t.net-dns.org.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_CNAME
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "nx2.cname.t.net-dns.org.">,
+    "name": <bindata for nx2.cname.t.net-dns.org.>,
     "rdata":
     {
-      "cname": <bindata of "empty.non.terminals.t.net-dns.org.">,
-      "rdata_raw": <bindata of "empty.non.terminals.t.net-dns.org.">
+      "cname": <bindata for empty.non.terminals.t.net-dns.org.>,
+      "rdata_raw": <bindata for empty.non.terminals.t.net-dns.org.>
     },
     "ttl": 30,
     "type": GETDNS_RRTYPE_CNAME
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "www.net-dns.org.">,
+    "name": <bindata for www.net-dns.org.>,
     "rdata":
     {
       "ipv4_address": <bindata for 185.49.140.22>,
@@ -1418,7 +1418,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "www.net-dns.org.">,
+    "name": <bindata for www.net-dns.org.>,
     "rdata":
     {
       "ipv6_address": <bindata for 2a04:b900::2:0:0:22>,
@@ -1429,7 +1429,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "apl.net-dns.org.">,
+    "name": <bindata for apl.net-dns.org.>,
     "rdata":
     {
       "apitems":
@@ -1472,7 +1472,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "ipseckey0.net-dns.org.">,
+    "name": <bindata for ipseckey0.net-dns.org.>,
     "rdata":
     {
       "algorithm": 10,
@@ -1485,7 +1485,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "ipseckey1.net-dns.org.">,
+    "name": <bindata for ipseckey1.net-dns.org.>,
     "rdata":
     {
       "algorithm": 10,
@@ -1500,7 +1500,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "ipseckey2.net-dns.org.">,
+    "name": <bindata for ipseckey2.net-dns.org.>,
     "rdata":
     {
       "algorithm": 10,
@@ -1515,11 +1515,11 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "ipseckey3.net-dns.org.">,
+    "name": <bindata for ipseckey3.net-dns.org.>,
     "rdata":
     {
       "algorithm": 10,
-      "gateway": <bindata of "mygateway.example.com.">,
+      "gateway": <bindata for mygateway.example.com.>,
       "gateway_type": 3,
       "precedence": 2,
       "public_key": <bindata of 0x010351537986ed35533b6064478eeeb2...>,
@@ -1530,7 +1530,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "ipseckey.net-dns.org.">,
+    "name": <bindata for ipseckey.net-dns.org.>,
     "rdata":
     {
       "algorithm": 10,
@@ -1543,7 +1543,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "ipseckey.net-dns.org.">,
+    "name": <bindata for ipseckey.net-dns.org.>,
     "rdata":
     {
       "algorithm": 10,
@@ -1558,7 +1558,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "ipseckey.net-dns.org.">,
+    "name": <bindata for ipseckey.net-dns.org.>,
     "rdata":
     {
       "algorithm": 10,
@@ -1573,11 +1573,11 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "ipseckey.net-dns.org.">,
+    "name": <bindata for ipseckey.net-dns.org.>,
     "rdata":
     {
       "algorithm": 10,
-      "gateway": <bindata of "mygateway.example.com.">,
+      "gateway": <bindata for mygateway.example.com.>,
       "gateway_type": 3,
       "precedence": 2,
       "public_key": <bindata of 0x010351537986ed35533b6064478eeeb2...>,
@@ -1588,7 +1588,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "default._domainkey.net-dns.org.">,
+    "name": <bindata for default._domainkey.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0xfd763d444b494d313b20723d706f7374...>,
@@ -1602,7 +1602,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "2.3.3.updates.spamassassin.net-dns.org.">,
+    "name": <bindata for 2.3.3.updates.spamassassin.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x083134313832313920>,
@@ -1616,7 +1616,7 @@ apl.net-dns.org.	3600	IN	APL	1:192.168.42.0/26 1:192.168.42.64/26 !1:192.168.42.
   },
   {
     "class": GETDNS_RRCLASS_IN,
-    "name": <bindata of "mirrors.updates.spamassassin.net-dns.org.">,
+    "name": <bindata for mirrors.updates.spamassassin.net-dns.org.>,
     "rdata":
     {
       "rdata_raw": <bindata of 0x3c687474703a2f2f616e6f6e796d6f75...>,
diff --git a/src/test/tpkg/270-header-extension.tpkg/270-header-extension.dsc b/src/test/tpkg/270-header-extension.tpkg/270-header-extension.dsc
index 2ac9ae37..f083f1b2 100644
--- a/src/test/tpkg/270-header-extension.tpkg/270-header-extension.dsc
+++ b/src/test/tpkg/270-header-extension.tpkg/270-header-extension.dsc
@@ -1,6 +1,6 @@
 BaseName: 270-header-extension
 Version: 1.0
-Description: Test json pointers
+Description: Set values in the DNS header with the header extension
 CreationDate: do 28 apr 2016 13:48:05 CEST
 Maintainer: Willem Toorop
 Category: 
diff --git a/src/test/tpkg/270-header-extension.tpkg/270-header-extension.good b/src/test/tpkg/270-header-extension.tpkg/270-header-extension.good
index 2419d76b..0e829f2b 100644
--- a/src/test/tpkg/270-header-extension.tpkg/270-header-extension.good
+++ b/src/test/tpkg/270-header-extension.tpkg/270-header-extension.good
@@ -1,6 +1,6 @@
 {
   "answer_type": GETDNS_NAMETYPE_DNS,
-  "canonical_name": <bindata of "bogus.nlnetlabs.nl.">,
+  "canonical_name": <bindata for bogus.nlnetlabs.nl.>,
   "replies_tree":
   [
     {
@@ -8,7 +8,7 @@
       "answer": [],
       "answer_type": GETDNS_NAMETYPE_DNS,
       "authority": [],
-      "canonical_name": <bindata of "bogus.nlnetlabs.nl.">,
+      "canonical_name": <bindata for bogus.nlnetlabs.nl.>,
       "header":
       {
         "aa": 0,
diff --git a/src/util-internal.c b/src/util-internal.c
index 5731fea9..4e71dc75 100644
--- a/src/util-internal.c
+++ b/src/util-internal.c
@@ -707,7 +707,7 @@ _getdns_create_reply_dict(getdns_context *context, getdns_network_req *req,
 		goto error;
 	
 	cnames_followed = new_canonical;
-	while (new_canonical) {
+	while (cnames_followed < MAX_CNAME_REFERRALS && new_canonical) {
 		new_canonical = 0;
 
 		for ( rr_iter = _getdns_rr_iter_init(&rr_iter_storage
@@ -737,6 +737,7 @@ _getdns_create_reply_dict(getdns_context *context, getdns_network_req *req,
 			canonical_name = _getdns_rdf_if_or_as_decompressed(
 			    rdf_iter,canonical_name_space,&canonical_name_len);
 			new_canonical = 1;
+			cnames_followed++;
 		}
 	}
 	if (_getdns_dict_set_const_bindata(