From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 31 Jan 2020 13:13:41 +0000 (+0100)
Subject: dnstap unbound-dnstap-sock, comments and log output on tls error close.
X-Git-Tag: 1.11.0rc1~120^2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27a5239ccf58568455501d5e1e0a6f047ae644da;p=thirdparty%2Funbound.git

dnstap unbound-dnstap-sock, comments and log output on tls error close.
---

diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c
index 9e28b85d7..011d015dc 100644
--- a/dnstap/unbound-dnstap-socket.c
+++ b/dnstap/unbound-dnstap-socket.c
@@ -753,9 +753,13 @@ static ssize_t ssl_read_bytes(struct tap_data* data, void* buf, size_t len)
 			if(errno != 0)
 				log_err("SSL_read syscall: %s",
 					strerror(errno));
+			if(verbosity) log_info("dnstap client stream closed from %s",
+				(data->id?data->id:""));
 			return 0;
 		}
 		log_crypto_err("could not SSL_read");
+		if(verbosity) log_info("dnstap client stream closed from %s",
+			(data->id?data->id:""));
 		return 0;
 	}
 	return r;
@@ -861,7 +865,7 @@ static int reply_with_finish(int fd)
 	return 1;
 }
 
-/** perform SSL handshake, return 0 to wait for events, 1 to continue */
+/** perform SSL handshake, return 0 to wait for events, 1 if done */
 static int tap_handshake(struct tap_data* data)
 {
 	int r;
@@ -927,7 +931,7 @@ static void tap_callback(int fd, short ATTR_UNUSED(bits), void* arg)
 	}
 	while(data->len_done < 4) {
 		uint32_t l = (uint32_t)data->len;
-		ssize_t ret = tap_receive(data, 
+		ssize_t ret = tap_receive(data,
 			((uint8_t*)&l)+data->len_done, 4-data->len_done);
 		if(verbosity>=4) log_info("s recv %d", (int)ret);
 		if(ret == 0) {