X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=libatalk%2Fdsi%2Fdsi_stream.c;h=711a037b5098925c59c77198bb6350d390d9b5a3;hp=ccb8b76eae25d4dc091448ab8dff81e58ee2039a;hb=8e5e83dac34cf886996821a51dee5c971e7c51f2;hpb=056d3ef4c88ba09eabb1fcbf06bdd9fe6e7af4cf diff --git a/libatalk/dsi/dsi_stream.c b/libatalk/dsi/dsi_stream.c index ccb8b76e..711a037b 100644 --- a/libatalk/dsi/dsi_stream.c +++ b/libatalk/dsi/dsi_stream.c @@ -1,5 +1,6 @@ /* * Copyright (c) 1998 Adrian Sun (asun@zoology.washington.edu) + * Copyright (c) 2010,2011,2012 Frank Lahm * All rights reserved. See COPYRIGHT. * * this file provides the following functions: @@ -15,23 +16,21 @@ #include #include - -#ifdef HAVE_UNISTD_H #include -#endif - #include #include #include #include #include +#ifdef HAVE_SENDFILEV +#include +#endif + #include #include #include -#define min(a,b) ((a) < (b) ? (a) : (b)) - #ifndef MSG_MORE #define MSG_MORE 0x8000 #endif @@ -40,6 +39,17 @@ #define MSG_DONTWAIT 0x40 #endif +/* Pack a DSI header in wire format */ +static void dsi_header_pack_reply(const DSI *dsi, char *buf) +{ + buf[0] = dsi->header.dsi_flags; + buf[1] = dsi->header.dsi_command; + memcpy(buf + 2, &dsi->header.dsi_requestID, sizeof(dsi->header.dsi_requestID)); + memcpy(buf + 4, &dsi->header.dsi_code, sizeof(dsi->header.dsi_code)); + memcpy(buf + 8, &dsi->header.dsi_len, sizeof(dsi->header.dsi_len)); + memcpy(buf + 12, &dsi->header.dsi_reserved, sizeof(dsi->header.dsi_reserved)); +} + /* * afpd is sleeping too much while trying to send something. * May be there's no reader or the reader is also sleeping in write, @@ -61,6 +71,9 @@ static int dsi_peek(DSI *dsi) maxfd = dsi->socket + 1; while (1) { + if (dsi->socket == -1) + /* eg dsi_disconnect() might have disconnected us */ + return -1; FD_ZERO(&readfds); FD_ZERO(&writefds); @@ -137,7 +150,7 @@ static size_t from_buf(DSI *dsi, uint8_t *buf, size_t count) nbe = dsi->eof - dsi->start; if (nbe > 0) { - nbe = min((size_t)nbe, count); + nbe = MIN((size_t)nbe, count); memcpy(buf, dsi->start, nbe); dsi->start += nbe; @@ -197,7 +210,7 @@ static size_t dsi_buffered_stream_read(DSI *dsi, uint8_t *data, const size_t len } /* fill the buffer with 8192 bytes or until buffer is full */ - buflen = min(8192, dsi->end - dsi->eof); + buflen = MIN(8192, dsi->end - dsi->eof); if (buflen > 0) { ssize_t ret; ret = read(dsi->socket, dsi->eof, buflen); @@ -260,7 +273,7 @@ ssize_t dsi_stream_write(DSI *dsi, void *data, const size_t length, int mode) { size_t written; ssize_t len; - unsigned int flags = 0; + unsigned int flags; dsi->in_write++; written = 0; @@ -270,6 +283,11 @@ ssize_t dsi_stream_write(DSI *dsi, void *data, const size_t length, int mode) if (dsi->flags & DSI_DISCONNECTED) return -1; + if (mode & DSI_MSG_MORE) + flags = MSG_MORE; + else + flags = 0; + while (written < length) { len = send(dsi->socket, (uint8_t *) data + written, length - written, flags); if (len >= 0) { @@ -311,72 +329,118 @@ exit: return written; } - /* --------------------------------- */ #ifdef WITH_SENDFILE -ssize_t dsi_stream_read_file(DSI *dsi, int fromfd, off_t offset, const size_t length) +ssize_t dsi_stream_read_file(DSI *dsi, const int fromfd, off_t offset, const size_t length, const int err) { - int ret = 0; - size_t written; - ssize_t len; - off_t pos = offset; + int ret = 0; + size_t written = 0; + size_t total = length; + ssize_t len; + off_t pos = offset; + char block[DSI_BLOCKSIZ]; +#ifdef HAVE_SENDFILEV + int sfvcnt; + struct sendfilevec vec[2]; + ssize_t nwritten; +#endif - LOG(log_maxdebug, logtype_dsi, "dsi_stream_read_file(send %zd bytes): START", length); + LOG(log_maxdebug, logtype_dsi, "dsi_stream_read_file(off: %jd, len: %zu)", (intmax_t)offset, length); - if (dsi->flags & DSI_DISCONNECTED) - return -1; + if (dsi->flags & DSI_DISCONNECTED) + return -1; - dsi->in_write++; - written = 0; + dsi->in_write++; + + dsi->flags |= DSI_NOREPLY; + dsi->header.dsi_flags = DSIFL_REPLY; + dsi->header.dsi_len = htonl(length); + dsi->header.dsi_code = htonl(err); + dsi_header_pack_reply(dsi, block); + +#ifdef HAVE_SENDFILEV + total += DSI_BLOCKSIZ; + sfvcnt = 2; + vec[0].sfv_fd = SFV_FD_SELF; + vec[0].sfv_flag = 0; + /* Cast to unsigned long to prevent sign extension of the + * pointer value for the LFS case; see Apache PR 39463. */ + vec[0].sfv_off = (unsigned long)block; + vec[0].sfv_len = DSI_BLOCKSIZ; + vec[1].sfv_fd = fromfd; + vec[1].sfv_flag = 0; + vec[1].sfv_off = offset; + vec[1].sfv_len = length; +#else + dsi_stream_write(dsi, block, sizeof(block), DSI_MSG_MORE); +#endif - while (written < length) { - len = sys_sendfile(dsi->socket, fromfd, &pos, length - written); - - if (len < 0) { - if (errno == EINTR) - continue; - if (errno == EINVAL || errno == ENOSYS) { - ret = -1; - goto exit; - } - if (errno == EAGAIN || errno == EWOULDBLOCK) { -#if defined(SOLARIS) || defined(FREEBSD) - if (pos > offset) { - /* we actually have sent sth., adjust counters and keep trying */ - len = pos - offset; - written += len; - offset = pos; - } + while (written < total) { +#ifdef HAVE_SENDFILEV + nwritten = 0; + len = sendfilev(dsi->socket, vec, sfvcnt, &nwritten); +#else + len = sys_sendfile(dsi->socket, fromfd, &pos, total - written); #endif - if (dsi_peek(dsi)) { - /* can't go back to blocking mode, exit, the next read - will return with an error and afpd will die. - */ - break; - } - continue; - } - LOG(log_error, logtype_dsi, "dsi_stream_read_file: %s", strerror(errno)); - break; - } - else if (!len) { - /* afpd is going to exit */ - ret = -1; - goto exit; - } - else - written += len; - } + if (len < 0) { + switch (errno) { + case EINTR: + case EAGAIN: + len = 0; +#ifdef HAVE_SENDFILEV + len = (size_t)nwritten; +#else +#if defined(SOLARIS) || defined(FREEBSD) + if (pos > offset) { + /* we actually have sent sth., adjust counters and keep trying */ + len = pos - offset; + offset = pos; + } +#endif /* defined(SOLARIS) || defined(FREEBSD) */ +#endif /* HAVE_SENDFILEV */ - dsi->write_count += written; + if (dsi_peek(dsi) != 0) { + ret = -1; + goto exit; + } + break; + default: + LOG(log_error, logtype_dsi, "dsi_stream_read_file: %s", strerror(errno)); + ret = -1; + goto exit; + } + } else if (len == 0) { + /* afpd is going to exit */ + ret = -1; + goto exit; + } +#ifdef HAVE_SENDFILEV + if (sfvcnt == 2 && len >= vec[0].sfv_len) { + vec[1].sfv_off += len - vec[0].sfv_len; + vec[1].sfv_len -= len - vec[0].sfv_len; + + vec[0] = vec[1]; + sfvcnt = 1; + } else { + vec[0].sfv_off += len; + vec[0].sfv_len -= len; + } +#endif /* HAVE_SENDFILEV */ + LOG(log_maxdebug, logtype_dsi, "dsi_stream_read_file: wrote: %zd", len); + written += len; + } +#ifdef HAVE_SENDFILEV + written -= DSI_BLOCKSIZ; +#endif + dsi->write_count += written; exit: - dsi->in_write--; - LOG(log_maxdebug, logtype_dsi, "dsi_stream_read_file: sent: %zd", written); - if (ret != 0) - return -1; - return written; + dsi->in_write--; + LOG(log_maxdebug, logtype_dsi, "dsi_stream_read_file: written: %zd", written); + if (ret != 0) + return -1; + return written; } #endif @@ -444,14 +508,7 @@ int dsi_stream_send(DSI *dsi, void *buf, size_t length) if (dsi->flags & DSI_DISCONNECTED) return 0; - block[0] = dsi->header.dsi_flags; - block[1] = dsi->header.dsi_command; - memcpy(block + 2, &dsi->header.dsi_requestID, - sizeof(dsi->header.dsi_requestID)); - memcpy(block + 4, &dsi->header.dsi_code, sizeof(dsi->header.dsi_code)); - memcpy(block + 8, &dsi->header.dsi_len, sizeof(dsi->header.dsi_len)); - memcpy(block + 12, &dsi->header.dsi_reserved, - sizeof(dsi->header.dsi_reserved)); + dsi_header_pack_reply(dsi, block); if (!length) { /* just write the header */ LOG(log_maxdebug, logtype_dsi, "dsi_stream_send(%u bytes): DSI header, no data", sizeof(block)); @@ -476,7 +533,7 @@ int dsi_stream_send(DSI *dsi, void *buf, size_t length) break; else if (len < 0) { /* error */ if (errno == EAGAIN || errno == EWOULDBLOCK) { - if (!dsi_peek(dsi)) { + if (dsi_peek(dsi) == 0) { continue; } } @@ -539,7 +596,7 @@ int dsi_stream_receive(DSI *dsi) dsi->clientID = ntohs(dsi->header.dsi_requestID); /* make sure we don't over-write our buffers. */ - dsi->cmdlen = min(ntohl(dsi->header.dsi_len), DSI_CMDSIZ); + dsi->cmdlen = MIN(ntohl(dsi->header.dsi_len), dsi->server_quantum); if (dsi_stream_read(dsi, dsi->commands, dsi->cmdlen) != dsi->cmdlen) return 0;