Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* initialise curclass.timeout to 900 in main(), so that operations that 

want to timeout using this value that are executed before the conf file
  is parsed will work. fixes ``stale ftpd stuck in connection phase''
* in PASV mode, wrap accept() in an alarm timeout. fixes ``stale ftpd because
  of client disappearing in pasv mode (usually browsers)''
* main() doesn't need envp argument
This commit is contained in:
lukem 1997-11-28 23:32:30 +00:00
parent f018043286
commit 0e2d417ded
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libexec/ftpd/ftpd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ftpd.c,v 1.41 1997/11/11 12:42:39 lukem Exp $ */
/* $NetBSD: ftpd.c,v 1.42 1997/11/28 23:32:30 lukem Exp $ */
/*
* Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994
@ -44,7 +44,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: ftpd.c,v 1.41 1997/11/11 12:42:39 lukem Exp $");
__RCSID("$NetBSD: ftpd.c,v 1.42 1997/11/28 23:32:30 lukem Exp $");
#endif
#endif /* not lint */
@ -200,7 +200,7 @@ static struct passwd *
sgetpwnam __P((char *));
static char *sgetsave __P((char *));
int main __P((int, char *[], char **));
int main __P((int, char *[]));
#if defined(KERBEROS) || defined(KERBEROS5)
int klogin __P((struct passwd *, char *, char *, char *));
@ -221,10 +221,9 @@ curdir()
}
int
main(argc, argv, envp)
main(argc, argv)
int argc;
char *argv[];
char **envp;
{
int addrlen, ch, on = 1, tos;
char *cp, line[LINE_MAX];
@ -362,6 +361,7 @@ main(argc, argv, envp)
(void) gethostname(hostname, sizeof(hostname));
reply(220, "%s FTP server (%s) ready.", hostname, version);
(void) setjmp(errcatch);
curclass.timeout = 900; /* 15 minutes. XXXLUKEM this is ugly */
for (;;)
(void) yyparse();
/* NOTREACHED */
@ -994,7 +994,9 @@ dataconn(name, size, mode)
struct sockaddr_in from;
int s, fromlen = sizeof(from);
(void) alarm(curclass.timeout);
s = accept(pdata, (struct sockaddr *)&from, &fromlen);
(void) alarm(0);
if (s < 0) {
reply(425, "Can't open data connection.");
(void) close(pdata);