From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2210) id 92EE4386F02D; Fri, 23 Oct 2020 12:23:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 92EE4386F02D Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: AF_INET and AF_LOCAL: recv_internal: fix MSG_WAITALL support X-Act-Checkin: newlib-cygwin X-Git-Author: Ken Brown via Cygwin-patches X-Git-Refname: refs/heads/master X-Git-Oldrev: 0c3c451ae3ab23a4558cdbf230d06db39402ec6e X-Git-Newrev: 3752ab804bda1cbb38b5da91db8cf14f8bdefa2f Message-Id: <20201023122357.92EE4386F02D@sourceware.org> Date: Fri, 23 Oct 2020 12:23:57 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2020 12:23:57 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=3752ab804bda1cbb38b5da91db8cf14f8bdefa2f commit 3752ab804bda1cbb38b5da91db8cf14f8bdefa2f Author: Ken Brown via Cygwin-patches Date: Mon Oct 12 14:02:13 2020 -0400 Cygwin: AF_INET and AF_LOCAL: recv_internal: fix MSG_WAITALL support If MSG_WAITALL is set, recv_internal calls WSARecv or WSARecvFrom in a loop, in an effort to fill all the scatter-gather buffers. The test for whether all the buffers are full was previously incorrect. Diff: --- winsup/cygwin/fhandler_socket_inet.cc | 2 +- winsup/cygwin/fhandler_socket_local.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/fhandler_socket_inet.cc b/winsup/cygwin/fhandler_socket_inet.cc index 71e92e341..bc08d3cf1 100644 --- a/winsup/cygwin/fhandler_socket_inet.cc +++ b/winsup/cygwin/fhandler_socket_inet.cc @@ -1208,7 +1208,7 @@ fhandler_socket_inet::recv_internal (LPWSAMSG wsamsg, bool use_recvmsg) --wsacnt; } } - if (!wret) + if (!wsacnt) break; } else if (WSAGetLastError () != WSAEWOULDBLOCK) diff --git a/winsup/cygwin/fhandler_socket_local.cc b/winsup/cygwin/fhandler_socket_local.cc index 8bfba225a..c94bf828f 100644 --- a/winsup/cygwin/fhandler_socket_local.cc +++ b/winsup/cygwin/fhandler_socket_local.cc @@ -1212,7 +1212,7 @@ fhandler_socket_local::recv_internal (LPWSAMSG wsamsg, bool use_recvmsg) --wsacnt; } } - if (!wret) + if (!wsacnt) break; } else if (WSAGetLastError () != WSAEWOULDBLOCK)