d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Timeout when an expected accept does not happen after all.

Browse Source 
This gets rids of dozens of hanging ftpd's because some broken
pc implementation `forgets' to open a passive connection.
Obtained from: Wietse Venema
This commit is contained in:
Guido van Rooij 1995-11-29 19:52:30 +00:00
parent 8e050b2e86
commit d6ed3c374d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=12532
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libexec/ftpd/ftpd.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ftpd.c,v 1.11 1995/08/05 19:12:05 pst Exp $
* $Id: ftpd.c,v 1.12 1995/08/28 21:30:49 mpp Exp $
*/
#ifndef lint
@ -922,9 +922,17 @@ dataconn(name, size, mode)
if (pdata >= 0) {
struct sockaddr_in from;
int s, fromlen = sizeof(from);
struct timeval timeout;
fd_set set;
s = accept(pdata, (struct sockaddr *)&from, &fromlen);
if (s < 0) {
FD_ZERO(&set);
FD_SET(pdata, &set);
timeout.tv_usec = 0;
timeout.tv_sec = 120;
if (select(pdata+1, &set, (fd_set *) 0, (fd_set *) 0, &timeout) == 0 ||
(s = accept(pdata, (struct sockaddr *) &from, &fromlen)) < 0) {
reply(425, "Can't open data connection.");
(void) close(pdata);
pdata = -1;