X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ftpd.c;h=f013777ec65dcb39a3660f5234baa79a143fe005;hb=refs%2Fheads%2Fmaster;hp=d7f460621d8013a9d6cc08811093583e95cc4af0;hpb=edd8d592e5a946f6f6ffc3dcd5e7e05da8ed4261;p=betaftpd diff --git a/ftpd.c b/ftpd.c index d7f4606..f013777 100644 --- a/ftpd.c +++ b/ftpd.c @@ -36,6 +36,10 @@ #include #endif +#if HAVE_SYS_TYPES_H +#include +#endif + #if HAVE_SYS_CONF_H #include #endif @@ -72,22 +76,14 @@ #include #endif -#if HAVE_ARPA_INET_H -#include -#endif - -#if HAVE_SYS_STAT_H -#include -#endif - -#if HAVE_SYS_IOCTL_H -#include -#endif - #if HAVE_NETINET_IN_SYSTM_H #include #endif +#if HAVE_NETINET_IN_H +#include +#endif + #if HAVE_NETINET_IP_H #include #endif @@ -96,6 +92,18 @@ #include #endif +#if HAVE_ARPA_INET_H +#include +#endif + +#if HAVE_SYS_STAT_H +#include +#endif + +#if HAVE_SYS_IOCTL_H +#include +#endif + #if HAVE_LINUX_SOCKET_H #include #endif @@ -176,6 +184,7 @@ struct ftran *first_ftran = NULL; #if WANT_DCACHE struct dcache *first_dcache = NULL; #endif +char message_buf[512]; #if HAVE_POLL unsigned int highest_fds = 0; @@ -194,7 +203,7 @@ fd_set master_fds, master_send_fds; FILE *xferlog = NULL; #endif -#if HAVE_LINUX_SENDFILE +#if HAVE_LINUX_SENDFILE || HAVE_BSD_SENDFILE int sendfile_supported = 1; #endif @@ -206,7 +215,7 @@ int sendfile_supported = 1; */ int time_to_check = 1; -#ifndef HAVE_SPRINTF +#ifndef HAVE_SNPRINTF /* * snprintf(): snprintf() replacement for systems that miss it. Note * that this implementation does _not_ necessarily protect @@ -357,7 +366,7 @@ struct conn *alloc_new_conn(const int sock) const unsigned int one = 1; struct conn *c = (struct conn *)(malloc(sizeof(struct conn))); - if (c == NULL) return c; + if (c == NULL) return NULL; if (sock != -1) { ioctl(sock, FIONBIO, &one); @@ -382,6 +391,7 @@ struct conn *alloc_new_conn(const int sock) #if WANT_ASCII c->ascii_mode = 0; #endif + c->free_me = 0; /* * equals: @@ -398,7 +408,7 @@ struct conn *alloc_new_conn(const int sock) time(&(c->last_transfer)); - /*list_clients();*/ + /* list_clients(); */ return c; } @@ -436,6 +446,9 @@ struct ftran *alloc_new_ftran(const int sock, const struct conn * const c) #endif f->dir_listing = 0; +#if WANT_UPLOAD + f->upload = 0; +#endif return f; } @@ -573,7 +586,7 @@ int process_all_clients(const fd_set * const active_clients, const int num_ac) c->buf_len += bytes_avail; parse_command(c); - if (fds[c->sock].revents & (POLLERR|POLLHUP|POLLNVAL)) { + if (c->free_me || (fds[c->sock].revents & (POLLERR|POLLHUP|POLLNVAL))) { destroy_conn(c); } } @@ -588,7 +601,12 @@ int process_all_clients(const fd_set * const active_clients, const int num_ac) */ void finish_transfer(struct ftran * const f) { - numeric(f->owner, 226, "Transfer complete."); + char finished[] = "226 Transfer complete.\r\n"; + if (send(f->owner->sock, finished, strlen(finished), 0) == -1 && errno == EPIPE) { + destroy_conn(f->owner); + return; + } + time(&(f->owner->last_transfer)); #if WANT_XFERLOG @@ -617,15 +635,14 @@ int process_all_sendfiles(fd_set * const active_clients, const int num_ac) { struct ftran *f = NULL, *next = first_ftran->next_ftran; int checked_through = 0; - struct sockaddr tempaddr; - int tempaddr_len = sizeof(tempaddr); + int tempaddr_len = sizeof(struct sockaddr_in); while (next != NULL && checked_through < num_ac) { f = next; next = f->next_ftran; -#if HAVE_UPLOAD - if (f->upload == 1 && fds[f->sock].revents & POLLHUP) { +#if WANT_UPLOAD + if ((f->upload == 1) && (fds[f->sock].revents & POLLHUP)) { finish_transfer(f); continue; } @@ -657,8 +674,7 @@ int process_all_sendfiles(fd_set * const active_clients, const int num_ac) if (f->state == 2) { /* incoming PASV */ const unsigned int one = 1; - const int tempsock = accept(f->sock, (struct sockaddr *)&tempaddr, - &tempaddr_len); + const int tempsock = accept(f->sock, &(f->sin), &tempaddr_len); del_fd(f->sock); @@ -670,12 +686,25 @@ int process_all_sendfiles(fd_set * const active_clients, const int num_ac) f->sock = tempsock; ioctl(f->sock, FIONBIO, &one); init_file_transfer(f); + + flush_numeric(f->owner); + if (f->owner->free_me) { + destroy_conn(f->owner); + continue; + } + #if WANT_UPLOAD if (f->upload) continue; #endif } if (f->state < 5) { init_file_transfer(f); + + flush_numeric(f->owner); + if (f->owner->free_me) { + destroy_conn(f->owner); + continue; + } #if WANT_UPLOAD if (f->upload) continue; #endif @@ -733,7 +762,7 @@ int do_upload(struct ftran *f) #endif if (size > 0 && (write(f->local_file, upload_buf, size) == size)) { return 1; - } else if (size == -1) { + } else if (size == -1 && errno != EAGAIN) { /* don't write xferlog... or? */ numeric(f->owner, 426, strerror(errno)); destroy_ftran(f); @@ -760,7 +789,7 @@ int do_download(struct ftran *f) #endif int size; -#if HAVE_LINUX_SENDFILE +#if HAVE_LINUX_SENDFILE || HAVE_BSD_SENDFILE /* * We handle the optimal case first, which is sendfile(). * Here we use a rather simplified sending `algorithm', @@ -779,7 +808,7 @@ int do_download(struct ftran *f) } #endif - err = sendfile(f->sock, f->local_file, &f->pos, size); + err = mysendfile(f->sock, f->local_file, &f->pos, size); return (f->pos < f->size) && (err > -1); } #endif @@ -839,11 +868,11 @@ void write_xferlog(struct ftran *f) if (xferlog == NULL) return; - strftime(temp, 256, "%a %b %d %H:%M:%S %Y", t); + strftime(temp, 256, "%a %b %d %H:%M:%S %Y", t); #if WANT_UPLOAD - fprintf(xferlog, "%s %u %s %lu %s b _ %c a %s ftp 0 * \n", + fprintf(xferlog, "%s %u %s %lu %s b _ %c %c %s ftp 0 *\n", #else - fprintf(xferlog, "%s %u %s %lu %s b _ o a %s ftp 0 *\n", + fprintf(xferlog, "%s %u %s %lu %s b _ o %c %s ftp 0 *\n", #endif temp, (int)(difftime(now, f->tran_start)), inet_ntoa(f->sin.sin_addr), f->size, @@ -851,7 +880,7 @@ void write_xferlog(struct ftran *f) #if WANT_UPLOAD (f->upload) ? 'i' : 'o', #endif - f->owner->username); + (f->owner->auth == 4) ? 'r' : 'a', f->owner->username); fflush(xferlog); #if 0 @@ -944,8 +973,8 @@ int main(void) #warning No xferlog support for nonroot yet #else /* open xferlog */ - xferlog = fopen("/var/log/xferlog", "r+"); - if (xferlog == NULL) xferlog = fopen("/usr/adm/xferlog", "r+"); + xferlog = fopen("/var/log/xferlog", "a"); + if (xferlog == NULL) xferlog = fopen("/usr/adm/xferlog", "a"); if (xferlog != NULL) { fseek(xferlog, 0L, SEEK_END); @@ -973,7 +1002,7 @@ int main(void) alarm(60); signal(SIGALRM, handle_alarm); -#if HAVE_LINUX_SENDFILE +#if HAVE_LINUX_SENDFILE || HAVE_BSD_SENDFILE /* check that sendfile() is really implemented (same check as configure does) */ { int out_fd = 1, in_fd = 0; @@ -981,7 +1010,7 @@ int main(void) size_t size = 1024; errno = 0; - sendfile(out_fd, in_fd, &offset, size); + mysendfile(out_fd, in_fd, &offset, size); if (errno == ENOSYS) sendfile_supported = 0; } #endif @@ -1111,10 +1140,14 @@ void accept_new_client(int * const server_sock) struct conn * const c = alloc_new_conn(tempsock); num_err = 0; if (c != NULL) { - numeric(c, 220, "BetaFTPD " VERSION " ready."); + char hello[] = "220 BetaFTPD " VERSION " ready.\r\n"; + #if WANT_STAT memcpy(&(c->addr), &tempaddr, sizeof(struct sockaddr)); #endif + + if (send(tempsock, hello, strlen(hello), 0) == -1 && errno == EPIPE) + destroy_conn(c); } } } @@ -1186,23 +1219,36 @@ void remove_bytes(struct conn * const c, const int num) * you can use this command much the same way as you * would use a printf() (with all the normal %s, %d, * etc.), since it actually uses printf() internally. + * + * This command doesn't actually SEND the data -- it + * just puts it in a buffer which is sent after the + * command handler has completed. The reasons for this + * are simple -- it makes error checking and cleanup + * MUCH cleaner, so we won't have to check for errors + * in every single little branch of the code. */ void numeric(struct conn * const c, const int numeric, const char * const format, ...) { - char buf[256], fmt[256]; + char fmt[256]; va_list args; - int i, err; + int i; + int in_buf = strlen(message_buf); snprintf(fmt, 256, "%03u %s\r\n", numeric, format); va_start(args, format); - i = vsnprintf(buf, 256, fmt, args); + i = vsnprintf(message_buf + in_buf, 512 - in_buf, fmt, args); va_end(args); +} - err = send(c->sock, buf, i, 0); - if (err == -1 && errno == EPIPE) { - destroy_conn(c); - } +/* flush_numeric(): + * Actually flushes the buffer written by numeric() -- but does + * NOT erase it. If an error, sets the "free_me" flag in the socket. + */ +void flush_numeric(struct conn * const c) +{ + if (send(c->sock, message_buf, strlen(message_buf), 0) == -1 && errno == EPIPE) + c->free_me = 1; } /* @@ -1338,7 +1384,7 @@ void init_file_transfer(struct ftran * const f) */ #if HAVE_MMAP if (f->dir_listing == 0) { -#if HAVE_LINUX_SENDFILE +#if HAVE_LINUX_SENDFILE || HAVE_BSD_SENDFILE int do_mmap = (sendfile_supported) ? 0 : 1; #else int do_mmap = 1; @@ -1481,6 +1527,24 @@ void clear_bad_fds(int * const server_sock) } #endif +#if HAVE_BSD_SENDFILE || HAVE_LINUX_SENDFILE +int mysendfile(int sock, int fd, off_t *offset, size_t count) +{ +#if HAVE_BSD_SENDFILE + int err; + off_t ssize = 0; + + err = sendfile(fd, sock, *offset, count, NULL, &ssize, 0); + if (ssize > 0) *offset += ssize; +#else /* !HAVE_BSD_SENDFILE */ +#if HAVE_LINUX_SENDFILE + return sendfile(sock, fd, offset, count); +#endif /* HAVE_LINUX_SENDFILE */ +#endif /* !HAVE_BSD_SENDFILE */ +} +#endif /* HAVE_BSD_SENDFILE || HAVE_LINUX_SENDFILE */ + + #if WANT_MESSAGE /* * dump_file(): Dumps a file on the control connection. Used for