clones/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2024-09-21 22:57:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'branch-1.17.0'

Browse Source
This commit is contained in:
W.C.A. Wijngaards 2022-10-13 09:32:22 +02:00
commit f5e1ef650d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Changelog
View File

@ -1,3 +1,7 @@
11 October 2022: George
- Fix PROXYv2 header read for TCP connections when no proxied addresses
are provided.
7 October 2022: Wouter 7 October 2022: Wouter
- Tag for 1.17.0rc1 release. - Tag for 1.17.0rc1 release.

10
util/netevent.c
View File

@ -1694,7 +1694,10 @@ ssl_handle_read(struct comm_point* c)
"part of PROXYv2 header (len %lu)", "part of PROXYv2 header (len %lu)",
(unsigned long)want_read_size); (unsigned long)want_read_size);
current_read_size = PP2_HEADER_SIZE + want_read_size; current_read_size = PP2_HEADER_SIZE + want_read_size;
if(c->tcp_byte_count < current_read_size) { if(want_read_size == 0) {
/* nothing more to read; header is complete */
c->pp2_header_state = pp2_header_done;
} else if(c->tcp_byte_count < current_read_size) {
ERR_clear_error(); ERR_clear_error();
if((r=SSL_read(c->ssl, (void*)sldns_buffer_at( if((r=SSL_read(c->ssl, (void*)sldns_buffer_at(
c->buffer, c->tcp_byte_count), c->buffer, c->tcp_byte_count),
@ -2083,7 +2086,10 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
"part of PROXYv2 header (len %lu)", "part of PROXYv2 header (len %lu)",
(unsigned long)want_read_size); (unsigned long)want_read_size);
current_read_size = PP2_HEADER_SIZE + want_read_size; current_read_size = PP2_HEADER_SIZE + want_read_size;
if(c->tcp_byte_count < current_read_size) { if(want_read_size == 0) {
/* nothing more to read; header is complete */
c->pp2_header_state = pp2_header_done;
} else if(c->tcp_byte_count < current_read_size) {
r = recv(fd, (void*)sldns_buffer_at(c->buffer, r = recv(fd, (void*)sldns_buffer_at(c->buffer,
c->tcp_byte_count), c->tcp_byte_count),
current_read_size-c->tcp_byte_count, MSG_DONTWAIT); current_read_size-c->tcp_byte_count, MSG_DONTWAIT);