luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win: move logic to set socket non-inheritable to uv_tcp_set_socket

Browse Source 
PR-URL: https://github.com/libuv/libuv/pull/400
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Saúl Ibarra Corretgé 2015-06-18 13:59:12 +02:00
parent fb5df542ac
commit 2dddd565fd
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/win/tcp.c
View File

@ -78,8 +78,11 @@ static int uv__tcp_keepalive(uv_tcp_t* handle, SOCKET socket, int enable, unsign
} }
static int uv_tcp_set_socket(uv_loop_t* loop, uv_tcp_t* handle, static int uv_tcp_set_socket(uv_loop_t* loop,
SOCKET socket, int family, int imported) { uv_tcp_t* handle,
SOCKET socket,
int family,
int imported) {
DWORD yes = 1; DWORD yes = 1;
int non_ifs_lsp; int non_ifs_lsp;
int err; int err;
@ -92,6 +95,10 @@ static int uv_tcp_set_socket(uv_loop_t* loop, uv_tcp_t* handle,
return WSAGetLastError(); return WSAGetLastError();
} }
/* Make the socket non-inheritable */
if (!SetHandleInformation((HANDLE) socket, HANDLE_FLAG_INHERIT, 0))
return GetLastError();
/* Associate it with the I/O completion port. */ /* Associate it with the I/O completion port. */
/* Use uv_handle_t pointer as completion key. */ /* Use uv_handle_t pointer as completion key. */
if (CreateIoCompletionPort((HANDLE)socket, if (CreateIoCompletionPort((HANDLE)socket,
@ -268,13 +275,6 @@ static int uv_tcp_try_bind(uv_tcp_t* handle,
return WSAGetLastError(); return WSAGetLastError();
} }
/* Make the socket non-inheritable */
if (!SetHandleInformation((HANDLE) sock, HANDLE_FLAG_INHERIT, 0)) {
err = GetLastError();
closesocket(sock);
return err;
}
err = uv_tcp_set_socket(handle->loop, handle, sock, addr->sa_family, 0); err = uv_tcp_set_socket(handle->loop, handle, sock, addr->sa_family, 0);
if (err) { if (err) {
closesocket(sock); closesocket(sock);
@ -381,15 +381,6 @@ static void uv_tcp_queue_accept(uv_tcp_t* handle, uv_tcp_accept_t* req) {
return; return;
} }
/* Make the socket non-inheritable */
if (!SetHandleInformation((HANDLE) accept_socket, HANDLE_FLAG_INHERIT, 0)) {
SET_REQ_ERROR(req, GetLastError());
uv_insert_pending_req(loop, (uv_req_t*)req);
handle->reqs_pending++;
closesocket(accept_socket);
return;
}
/* Prepare the overlapped structure. */ /* Prepare the overlapped structure. */
memset(&(req->u.io.overlapped), 0, sizeof(req->u.io.overlapped)); memset(&(req->u.io.overlapped), 0, sizeof(req->u.io.overlapped));
if (handle->flags & UV_HANDLE_EMULATE_IOCP) { if (handle->flags & UV_HANDLE_EMULATE_IOCP) {
@ -1166,12 +1157,6 @@ int uv_tcp_import(uv_tcp_t* tcp, uv__ipc_socket_info_ex* socket_info_ex,
return WSAGetLastError(); return WSAGetLastError();
} }
if (!SetHandleInformation((HANDLE) socket, HANDLE_FLAG_INHERIT, 0)) {
err = GetLastError();
closesocket(socket);
return err;
}
err = uv_tcp_set_socket(tcp->loop, err = uv_tcp_set_socket(tcp->loop,
tcp, tcp,
socket, socket,
@ -1427,11 +1412,6 @@ int uv_tcp_open(uv_tcp_t* handle, uv_os_sock_t sock) {
return uv_translate_sys_error(GetLastError()); return uv_translate_sys_error(GetLastError());
} }
/* Make the socket non-inheritable */
if (!SetHandleInformation((HANDLE) sock, HANDLE_FLAG_INHERIT, 0)) {
return uv_translate_sys_error(GetLastError());
}
err = uv_tcp_set_socket(handle->loop, err = uv_tcp_set_socket(handle->loop,
handle, handle,
sock, sock,