From: Grigorii Demidov <grigorii.demidov@nic.cz>
Date: Fri, 7 Dec 2018 10:22:59 +0000 (+0100)
Subject: daemon/io: improved log
X-Git-Tag: v3.2.0~15^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8fbe4b4e39129458558bb8378ae21114a6fb55c;p=thirdparty%2Fknot-resolver.git

daemon/io: improved log
---

diff --git a/daemon/io.c b/daemon/io.c
index 855b35a94..90d2dbb26 100644
--- a/daemon/io.c
+++ b/daemon/io.c
@@ -177,6 +177,10 @@ void tcp_timeout_trigger(uv_timer_t *timer)
 			session_timer_start(s, tcp_timeout_trigger,
 					    idle_in_timeout, idle_in_timeout);
 		} else {
+			struct sockaddr *peer = session_get_peer(s);
+			char *peer_str = kr_straddr(peer);
+			kr_log_verbose("[io] => closing connection to '%s'\n",
+				       peer_str ? peer_str : "");
 			session_close(s);
 		}
 	}
@@ -201,10 +205,9 @@ static void tcp_recv(uv_stream_t *handle, ssize_t nread, const uv_buf_t *buf)
 	if (nread < 0 || !buf->base) {
 		if (kr_verbose_status) {
 			struct sockaddr *peer = session_get_peer(s);
-			char peer_str[INET6_ADDRSTRLEN];
-			inet_ntop(peer->sa_family, kr_inaddr(peer),
-				  peer_str, sizeof(peer_str));
-			kr_log_verbose("[io] => connection to '%s' closed by peer (%s)\n", peer_str,
+			char *peer_str = kr_straddr(peer);
+			kr_log_verbose("[io] => connection to '%s' closed by peer (%s)\n",
+				       peer_str ? peer_str : "",
 				       uv_strerror(nread));
 		}
 		worker_end_tcp(s);