upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-02-18 01:58:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changelog note for #326 and changes:

Browse source 
- DoH content length, simplify code, remove declaration after
  statement and fix cast warning.
This commit is contained in:
W.C.A. Wijngaards 2020-10-15 08:22:42 +02:00
parent 7a7d7caf6a
commit edc8f363a7
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/Changelog
View file

@ -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

11
services/listen_dnsport.c
View file

@ -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;