drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fhandler_socket.cc (fhandler_socket::sendto): Never send more than 

64K.  Add comment to explain why.
	(fhandler_socket::sendmsg): Ditto.
This commit is contained in:
Corinna Vinschen 2008-03-07 14:47:48 +00:00
parent 752b16ce35
commit 360b05b451
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-07 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (fhandler_socket::sendto): Never send more than
64K. Add comment to explain why.
(fhandler_socket::sendmsg): Ditto.
2008-03-07 Corinna Vinschen <corinna@vinschen.de> 2008-03-07 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in (DLL_OFILES): Add tls_pbuf.o. * Makefile.in (DLL_OFILES): Add tls_pbuf.o.

23
winsup/cygwin/fhandler_socket.cc
View File

@ -1393,7 +1393,13 @@ fhandler_socket::sendto (const void *ptr, size_t len, int flags,
if (to && !get_inet_addr (to, tolen, &sst, &tolen)) if (to && !get_inet_addr (to, tolen, &sst, &tolen))
return SOCKET_ERROR; return SOCKET_ERROR;
WSABUF wsabuf = { len, (char *) ptr }; /* Never write more than 64K at once to workaround a problem with
Winsock, which creates a temporary buffer with the total incoming
buffer size and copies the whole content over, regardless of
the size of the internal send buffer. A buffer full condition
is only recognized in subsequent calls and, if len is big enough,
the call even might fail with an out-of-memory condition. */
WSABUF wsabuf = { len > 65536 ? 65536 : len, (char *) ptr };
return send_internal (&wsabuf, 1, flags, return send_internal (&wsabuf, 1, flags,
(to ? (const struct sockaddr *) &sst : NULL), tolen); (to ? (const struct sockaddr *) &sst : NULL), tolen);
} }
@ -1411,12 +1417,17 @@ fhandler_socket::sendmsg (const struct msghdr *msg, int flags)
} }
WSABUF wsabuf[msg->msg_iovlen]; WSABUF wsabuf[msg->msg_iovlen];
WSABUF *wsaptr = wsabuf + msg->msg_iovlen; WSABUF *wsaptr = wsabuf;
const struct iovec *iovptr = msg->msg_iov + msg->msg_iovlen; const struct iovec *iovptr = msg->msg_iov;
while (--wsaptr >= wsabuf) size_t total = 0;
for (int i = 0; i < msg->msg_iovlen && total < 65536; ++i)
{ {
wsaptr->len = (--iovptr)->iov_len; if (total + iovptr->iov_len > 65536) /* See above. */
wsaptr->buf = (char *) iovptr->iov_base; wsaptr->len = 65536 - total;
else
wsaptr->len = iovptr->iov_len;
total += wsaptr->len;
(wsaptr++)->buf = (char *) (iovptr++)->iov_base;
} }
return send_internal (wsabuf, msg->msg_iovlen, flags, return send_internal (wsabuf, msg->msg_iovlen, flags,