Make dig generate DoH URI using isc_nm_http_makeuri()

This commit replaces ad-hoc code for DoH connect URI construction with
isc_nm_http_makeuri(), making it handle IPv6 adresses properly (among
other things).

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 14859ed74c736317986da3404b5b1b37276c3422..0b27baefe6dd1a7c4005f1132be9faf859265d2a 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -2799,9 +2799,10 @@ start_tcp(dig_query_t *query) {
 #if HAVE_LIBNGHTTP2
                } else if (query->lookup->https_mode) {
                        char uri[4096] = { 0 };
-                       snprintf(uri, sizeof(uri), "https://%s:%u%s",
-                                query->userarg, (uint16_t)port,
-                                query->lookup->https_path);
+                       isc_nm_http_makeuri(!query->lookup->http_plain,
+                                           &query->sockaddr, query->userarg,
+                                           port, query->lookup->https_path,
+                                           uri, sizeof(uri));
 
                        if (!query->lookup->http_plain) {
                                result =