From: W.C.A. Wijngaards Date: Thu, 15 Oct 2020 06:22:42 +0000 (+0200) Subject: Changelog note for #326 and changes: X-Git-Tag: release-1.13.0rc1~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edc8f363a72951ad86112b07f64ce0a8f0495723;p=thirdparty%2Funbound.git Changelog note for #326 and changes: - DoH content length, simplify code, remove declaration after statement and fix cast warning. --- diff --git a/doc/Changelog b/doc/Changelog index c7076fd62..2d8c69e37 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,9 @@ +15 October 2020: Wouter + - Merge PR #326 from netblue30: DoH: implement content-length + header field + - DoH content length, simplify code, remove declaration after + statement and fix cast warning. + 14 October 2020: Wouter - Fix for python reply callback to see mesh state reply_list member, it only removes it briefly for the commpoint call so that it does diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index 796d62a37..1cdb32a9c 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -2180,7 +2180,7 @@ int http2_submit_dns_response(struct http2_session* h2_session) nghttp2_nv headers[3]; struct http2_stream* h2_stream = h2_session->c->h2_stream; size_t rlen; - char rlen_str[6]; // big enough to hold a uint16_t number + char rlen_str[32]; if(h2_stream->rbuffer) { log_err("http2 submit response error: rbuffer already " @@ -2199,12 +2199,7 @@ int http2_submit_dns_response(struct http2_session* h2_session) } rlen = sldns_buffer_remaining(h2_session->c->buffer); - int rv = snprintf(rlen_str, sizeof(rlen_str), "%u", rlen); - if (rv <= 0 || rv >= sizeof(rlen_str)) { - verbose(VERB_QUERY, "http2: submit response error: " - "data buffer too large"); - return 0; - } + snprintf(rlen_str, sizeof(rlen_str), "%u", rlen); lock_basic_lock(&http2_response_buffer_count_lock); if(http2_response_buffer_count + rlen > http2_response_buffer_max) { @@ -2238,7 +2233,7 @@ int http2_submit_dns_response(struct http2_session* h2_session) headers[2].name = (uint8_t*)"content-length"; headers[2].namelen = 14; - headers[2].value = rlen_str; + headers[2].value = (uint8_t*)rlen_str; headers[2].valuelen = strlen(rlen_str); headers[2].flags = NGHTTP2_NV_FLAG_NONE;