From 8f56da762afb4006ca63faea881ba323fe148a99 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 12 Jun 2006 13:13:52 +0000 Subject: [PATCH] * net.cc (fdsock): Disable raising buffer sizes. Add comment to explain why. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/net.cc | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index fd7ab6e54..288d214d8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2006-06-12 Corinna Vinschen + + * net.cc (fdsock): Disable raising buffer sizes. Add comment to + explain why. + 2006-06-04 Christopher Faylor * ioctl.cc (ioctl): Accommodate change in reported pty master device diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index da1796653..3bc92d2be 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -557,15 +557,26 @@ fdsock (cygheap_fdmanip& fd, const device *dev, SOCKET soc) fd->uninterruptible_io (true); cygheap->fdtab.inc_need_fixup_before (); debug_printf ("fd %d, name '%s', soc %p", (int) fd, dev->name, soc); +#if 0 + /* Same default buffer sizes as on Linux (instead of WinSock default 8K). + + NOT. If the SO_RCVBUF size exceeds 65535(*), and if the socket is + connected to a remote machine, then duplicating the socket on + fork/exec fails with WinSock error 10022, WSAEINVAL. Given that, + there's not any good reason to set the buffer sizes at all. So we + stick with the defaults. However, an explanation for this weird + behaviour would be nice. I keep this stuff in the code for later + generations. Archeological programmers might find it useful. + + (*) Maximum normal TCP window size. Coincidence? */ - /* Same default buffer sizes as on Linux (instead of WinSock default 8K). */ int rmem = dev == tcp_dev ? 87380 : 120832; int wmem = dev == tcp_dev ? 16384 : 120832; if (::setsockopt (soc, SOL_SOCKET, SO_RCVBUF, (char *) &rmem, sizeof (int))) debug_printf ("setsockopt(SO_RCVBUF) failed, %lu", WSAGetLastError ()); if (::setsockopt (soc, SOL_SOCKET, SO_SNDBUF, (char *) &wmem, sizeof (int))) debug_printf ("setsockopt(SO_SNDBUF) failed, %lu", WSAGetLastError ()); - +#endif return true; }