From 32072720cbc609e7bcf7985bcf999d035474198b Mon Sep 17 00:00:00 2001 From: Yaroslav Tykhiy Date: Fri, 9 Feb 2007 17:18:39 +0000 Subject: [PATCH] Let automatic TCP send buffer sizing do its job for ftpd(8): stop setting the SO_SNDBUF socket option. Using a hard-coded value for it was a poor idea anyway in the face of diverse network conditions. --- libexec/ftpd/ftpd.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index f331a4789a6..1a6a373b0eb 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1871,20 +1871,12 @@ getdatasock(char *mode) #ifdef TCP_NOPUSH /* * Turn off push flag to keep sender TCP from sending short packets - * at the boundaries of each write(). Should probably do a SO_SNDBUF - * to set the send buffer size as well, but that may not be desirable - * in heavy-load situations. + * at the boundaries of each write(). */ on = 1; if (setsockopt(s, IPPROTO_TCP, TCP_NOPUSH, &on, sizeof on) < 0) syslog(LOG_WARNING, "data setsockopt (TCP_NOPUSH): %m"); #endif -#ifdef SO_SNDBUF - on = 65536; - if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, &on, sizeof on) < 0) - syslog(LOG_WARNING, "data setsockopt (SO_SNDBUF): %m"); -#endif - return (fdopen(s, mode)); bad: /* Return the real value of errno (close may change it) */