sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Since atftpd uses signals, check for EINTR and continue

Browse source 
Approved by:	miwi
Feature safe:	yes
This commit is contained in:
Kevin Lo 2011-01-30 08:21:12 +00:00
parent 7faf1828cd
commit 60b38683d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=268413
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ftp/atftp/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= atftp PORTNAME= atftp
PORTVERSION= 0.7 PORTVERSION= 0.7
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= ftp CATEGORIES= ftp
MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/a/${PORTNAME} MASTER_SITE_SUBDIR= pool/main/a/${PORTNAME}

37
ftp/atftp/files/patch-tftpd.c
View file

@ -1,5 +1,5 @@
--- tftpd.c.orig 2010-10-11 11:30:50.000000000 +0800 --- tftpd.c.orig 2004-02-27 10:05:26.000000000 +0800
+++ tftpd.c 2010-10-11 11:31:42.000000000 +0800 +++ tftpd.c 2011-01-26 18:08:01.000000000 +0800
@@ -60,6 +60,9 @@ @@ -60,6 +60,9 @@
char directory[MAXLEN] = "/tftpboot/"; char directory[MAXLEN] = "/tftpboot/";
int retry_timeout = S_TIMEOUT; int retry_timeout = S_TIMEOUT;
@ -36,7 +36,7 @@
{ {
logger(LOG_WARNING, "Failed to set socket option: %s", strerror(errno)); logger(LOG_WARNING, "Failed to set socket option: %s", strerror(errno));
} }
@@ -387,10 +391,18 @@ @@ -387,10 +391,21 @@
packets */ packets */
if (!tftpd_cancel) if (!tftpd_cancel)
{ {
@ -51,13 +51,16 @@
+ if (rv < 0) { + if (rv < 0) {
+ logger(LOG_ERR, "%s: %d: select: %s", + logger(LOG_ERR, "%s: %d: select: %s",
+ __FILE__, __LINE__, strerror(errno)); + __FILE__, __LINE__, strerror(errno));
+ if (errno == EINTR)
+ continue;
+
+ /* Clear the bits, they are undefined! */ + /* Clear the bits, they are undefined! */
+ FD_ZERO(&rfds); + FD_ZERO(&rfds);
+ } + }
} }
#ifdef RATE_CONTROL #ifdef RATE_CONTROL
@@ -463,10 +475,12 @@ @@ -463,10 +478,12 @@
exit(1); exit(1);
} }
new->client_info->done = 0; new->client_info->done = 0;
@ -71,7 +74,7 @@
(void *)new) != 0) (void *)new) != 0)
{ {
logger(LOG_ERR, "Failed to start new thread"); logger(LOG_ERR, "Failed to start new thread");
@@ -567,7 +581,8 @@ @@ -567,7 +584,8 @@
/* Detach ourself. That way the main thread does not have to /* Detach ourself. That way the main thread does not have to
* wait for us with pthread_join. */ * wait for us with pthread_join. */
@ -81,7 +84,7 @@
/* Read the first packet from stdin. */ /* Read the first packet from stdin. */
data_size = data->data_buffer_size; data_size = data->data_buffer_size;
@@ -615,7 +630,25 @@ @@ -615,7 +633,25 @@
data->sockfd = socket(PF_INET, SOCK_DGRAM, 0); data->sockfd = socket(PF_INET, SOCK_DGRAM, 0);
to.sin_family = AF_INET; to.sin_family = AF_INET;
to.sin_port = 0; to.sin_port = 0;
@ -108,7 +111,7 @@
{ {
/* bind the socket to the interface */ /* bind the socket to the interface */
if (bind(data->sockfd, (struct sockaddr *)&to, len) == -1) if (bind(data->sockfd, (struct sockaddr *)&to, len) == -1)
@@ -630,17 +663,14 @@ @@ -630,17 +666,14 @@
logger(LOG_ERR, "getsockname: %s", strerror(errno)); logger(LOG_ERR, "getsockname: %s", strerror(errno));
retval = ABORT; retval = ABORT;
} }
@ -131,7 +134,7 @@
/* read options from request */ /* read options from request */
opt_parse_request(data->data_buffer, data_size, opt_parse_request(data->data_buffer, data_size,
data->tftp_options); data->tftp_options);
@@ -732,8 +762,8 @@ @@ -732,8 +765,8 @@
tftpd_clientlist_free(data); tftpd_clientlist_free(data);
/* free the thread structure */ /* free the thread structure */
@ -142,7 +145,7 @@
logger(LOG_INFO, "Server thread exiting"); logger(LOG_INFO, "Server thread exiting");
pthread_exit(NULL); pthread_exit(NULL);
} }
@@ -811,6 +841,7 @@ @@ -811,6 +844,7 @@
{ "no-multicast", 0, NULL, 'M' }, { "no-multicast", 0, NULL, 'M' },
{ "logfile", 1, NULL, 'L' }, { "logfile", 1, NULL, 'L' },
{ "pidfile", 1, NULL, 'I'}, { "pidfile", 1, NULL, 'I'},
@ -150,7 +153,7 @@
{ "daemon", 0, NULL, 'D' }, { "daemon", 0, NULL, 'D' },
{ "no-fork", 0, NULL, 'N'}, { "no-fork", 0, NULL, 'N'},
{ "user", 1, NULL, 'U'}, { "user", 1, NULL, 'U'},
@@ -888,6 +919,9 @@ @@ -888,6 +922,9 @@
case 'I': case 'I':
pidfile = strdup(optarg); pidfile = strdup(optarg);
break; break;
@ -160,7 +163,7 @@
case 'D': case 'D':
tftpd_daemon = 1; tftpd_daemon = 1;
break; break;
@@ -1015,6 +1049,10 @@ @@ -1015,6 +1052,10 @@
logger(LOG_INFO, " log file: %s", (log_file==NULL) ? "syslog":log_file); logger(LOG_INFO, " log file: %s", (log_file==NULL) ? "syslog":log_file);
if (pidfile) if (pidfile)
logger(LOG_INFO, " pid file: %s", pidfile); logger(LOG_INFO, " pid file: %s", pidfile);
@ -171,7 +174,17 @@
if (tftpd_daemon == 1) if (tftpd_daemon == 1)
logger(LOG_INFO, " server timeout: Not used"); logger(LOG_INFO, " server timeout: Not used");
else else
@@ -1111,11 +1149,12 @@ @@ -1085,8 +1126,7 @@
else
{
/* unlink the pid file */
- if (unlink(file) == -1)
- logger(LOG_ERR, "unlink: %s", strerror(errno));
+ unlink(file);
return OK;
}
}
@@ -1111,11 +1151,12 @@
" output messages\n" " output messages\n"
" --trace : log all sent and received packets\n" " --trace : log all sent and received packets\n"
" --no-timeout : disable 'timeout' from RFC2349\n" " --no-timeout : disable 'timeout' from RFC2349\n"