diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-06-12 13:13:52 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-06-12 13:13:52 +0000 |
| commit | 8f56da762afb4006ca63faea881ba323fe148a99 (patch) | |
| tree | 4e6d42b8007daef07bae8389324d340cde98afc2 /winsup/cygwin | |
| parent | d73228210d9ec017ca159959e0f79ccc64deb5a0 (diff) | |
| download | cygnal-8f56da762afb4006ca63faea881ba323fe148a99.tar.gz cygnal-8f56da762afb4006ca63faea881ba323fe148a99.tar.bz2 cygnal-8f56da762afb4006ca63faea881ba323fe148a99.zip | |
* net.cc (fdsock): Disable raising buffer sizes. Add comment to
explain why.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <corinna@vinschen.de> + + * net.cc (fdsock): Disable raising buffer sizes. Add comment to + explain why. + 2006-06-04 Christopher Faylor <cgf@timesys.com> * 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; } |