oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(dataconn): don't wait forever on accept

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10697 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2001-09-13 09:17:14 +00:00
parent c54aafe429
commit 7fc606fb54
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
appl/ftp/ftpd/ftpd.c
View File

@@ -1246,6 +1246,26 @@ bad:
return (NULL); return (NULL);
} }
static int
accept_with_timeout(int socket,
struct sockaddr *address,
size_t *address_len,
struct timeval *timeout)
{
int ret;
fd_set rfd;
FD_ZERO(&rfd);
FD_SET(socket, &rfd);
ret = select(socket + 1, &rfd, NULL, NULL, timeout);
if(ret < 0)
return ret;
if(ret == 0) {
errno = ETIMEDOUT;
return -1;
}
return accept(socket, address, address_len);
}
static FILE * static FILE *
dataconn(const char *name, off_t size, const char *mode) dataconn(const char *name, off_t size, const char *mode)
{ {
@@ -1262,10 +1282,13 @@ dataconn(const char *name, off_t size, const char *mode)
if (pdata >= 0) { if (pdata >= 0) {
struct sockaddr_storage from_ss; struct sockaddr_storage from_ss;
struct sockaddr *from = (struct sockaddr *)&from_ss; struct sockaddr *from = (struct sockaddr *)&from_ss;
struct timeval timeout;
int s; int s;
socklen_t fromlen = sizeof(from_ss); socklen_t fromlen = sizeof(from_ss);
s = accept(pdata, from, &fromlen); timeout.tv_sec = 15;
timeout.tv_usec = 0;
s = accept_with_timeout(pdata, from, &fromlen, &timeout);
if (s < 0) { if (s < 0) {
reply(425, "Can't open data connection."); reply(425, "Can't open data connection.");
close(pdata); close(pdata);