From: Witold Kręcicki <wpk@isc.org>
Date: Tue, 2 Jun 2020 08:39:05 +0000 (+0200)
Subject: isc_uv_import must pass UV__IPC_SOCKET_XFER_TCP_CONNECTION, not SERVER.
X-Git-Tag: v9.17.2~28^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=801f7af6e92808f9504245b28180804fb8e7228d;p=thirdparty%2Fbind9.git

isc_uv_import must pass UV__IPC_SOCKET_XFER_TCP_CONNECTION, not SERVER.

As a leftover from old TCP accept code isc_uv_import passed TCP_SERVER
flag when importing a socket on Windows.
Since now we're importing/exporting accepted connections it needs to
pass TCP_CONNECTION flag.
---

diff --git a/lib/isc/netmgr/uv-compat.c b/lib/isc/netmgr/uv-compat.c
index 4b6cbd74166..536541721f1 100644
--- a/lib/isc/netmgr/uv-compat.c
+++ b/lib/isc/netmgr/uv-compat.c
@@ -72,6 +72,7 @@ isc_uv_export(uv_stream_t *stream, isc_uv_stream_info_t *info) {
 	if (xfer_info.delayed_error != 0) {
 		return (xfer_info.delayed_error);
 	}
+	INSIST(xfer_type == UV__IPC_SOCKET_XFER_TCP_CONNECTION);
 	info->type = UV_TCP;
 	info->socket_info = xfer_info.socket_info;
 	return (0);
@@ -84,7 +85,7 @@ isc_uv_import(uv_stream_t *stream, isc_uv_stream_info_t *info) {
 	}
 
 	return (uv__tcp_xfer_import(
-		(uv_tcp_t *)stream, UV__IPC_SOCKET_XFER_TCP_SERVER,
+		(uv_tcp_t *)stream, UV__IPC_SOCKET_XFER_TCP_CONNECTION,
 		&(uv__ipc_socket_xfer_info_t){
 			.socket_info = info->socket_info }));
 }