diff options
| author | Ken Brown via Cygwin-patches <cygwin-patches@cygwin.com> | 2020-10-12 14:02:13 -0400 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2020-10-23 08:23:27 -0400 |
| commit | 3752ab804bda1cbb38b5da91db8cf14f8bdefa2f (patch) | |
| tree | f3da3206f86d7c50639287c454e763cb624ddc43 | |
| parent | 0c3c451ae3ab23a4558cdbf230d06db39402ec6e (diff) | |
| download | cygnal-3752ab804bda1cbb38b5da91db8cf14f8bdefa2f.tar.gz cygnal-3752ab804bda1cbb38b5da91db8cf14f8bdefa2f.tar.bz2 cygnal-3752ab804bda1cbb38b5da91db8cf14f8bdefa2f.zip | |
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.
| -rw-r--r-- | winsup/cygwin/fhandler_socket_inet.cc | 2 | ||||
| -rw-r--r-- | 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) |