From bf1cce6f9b0fa3f7c9667fc4bb6586698bd1d518 Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Thu, 6 Oct 2022 15:53:21 +0200 Subject: [PATCH] - Fix proxy length debug output printout typecasts. --- doc/Changelog | 1 + util/netevent.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 61a10f9a5..b73b8bdd1 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,7 @@ - Fix to stop responses with TC flag from resulting in partial responses. It retries to fetch the data elsewhere, or fails the query and in depth fix removes the TC flag from the cached item. + - Fix proxy length debug output printout typecasts. 5 October 2022: Wouter - Fix dnscrypt compile for proxy protocol code changes. diff --git a/util/netevent.c b/util/netevent.c index 55c9a041f..9e5436b93 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -1634,7 +1634,7 @@ ssl_handle_read(struct comm_point* c) } verbose(VERB_ALGO, "proxy_protocol: reading fixed " "part of PROXYv2 header (len %lu)", - want_read_size); + (unsigned long)want_read_size); current_read_size = want_read_size; if(c->tcp_byte_count < current_read_size) { ERR_clear_error(); @@ -1692,7 +1692,7 @@ ssl_handle_read(struct comm_point* c) } verbose(VERB_ALGO, "proxy_protocol: reading variable " "part of PROXYv2 header (len %lu)", - want_read_size); + (unsigned long)want_read_size); current_read_size = PP2_HEADER_SIZE + want_read_size; if(c->tcp_byte_count < current_read_size) { ERR_clear_error(); @@ -2045,7 +2045,7 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok) } verbose(VERB_ALGO, "proxy_protocol: reading fixed " "part of PROXYv2 header (len %lu)", - want_read_size); + (unsigned long)want_read_size); current_read_size = want_read_size; if(c->tcp_byte_count < current_read_size) { r = recv(fd, (void*)sldns_buffer_at(c->buffer, @@ -2081,7 +2081,7 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok) } verbose(VERB_ALGO, "proxy_protocol: reading variable " "part of PROXYv2 header (len %lu)", - want_read_size); + (unsigned long)want_read_size); current_read_size = PP2_HEADER_SIZE + want_read_size; if(c->tcp_byte_count < current_read_size) { r = recv(fd, (void*)sldns_buffer_at(c->buffer, -- 2.47.2