X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Fdsi%2Fdsi_stream.c;h=ccb8b76eae25d4dc091448ab8dff81e58ee2039a;hb=056d3ef4c88ba09eabb1fcbf06bdd9fe6e7af4cf;hp=5cd34a5815f67b5b8f654c41a754ed777a84f87e;hpb=ef25b4acfc5daa2f0ee7f1e17ee2d7d1a7f0d159;p=netatalk.git diff --git a/libatalk/dsi/dsi_stream.c b/libatalk/dsi/dsi_stream.c index 5cd34a58..ccb8b76e 100644 --- a/libatalk/dsi/dsi_stream.c +++ b/libatalk/dsi/dsi_stream.c @@ -28,7 +28,6 @@ #include #include -#include #include #define min(a,b) ((a) < (b) ? (a) : (b)) @@ -122,6 +121,137 @@ static int dsi_peek(DSI *dsi) return 0; } +/* + * Return all bytes up to count from dsi->buffer if there are any buffered there + */ +static size_t from_buf(DSI *dsi, uint8_t *buf, size_t count) +{ + size_t nbe = 0; + + if (dsi->buffer == NULL) + /* afpd master has no DSI buffering */ + return 0; + + LOG(log_maxdebug, logtype_dsi, "from_buf: %u bytes", count); + + nbe = dsi->eof - dsi->start; + + if (nbe > 0) { + nbe = min((size_t)nbe, count); + memcpy(buf, dsi->start, nbe); + dsi->start += nbe; + + if (dsi->eof == dsi->start) + dsi->start = dsi->eof = dsi->buffer; + } + + LOG(log_debug, logtype_dsi, "from_buf(read: %u, unread:%u , space left: %u): returning %u", + dsi->start - dsi->buffer, dsi->eof - dsi->start, dsi->end - dsi->eof, nbe); + + return nbe; +} + +/* + * Get bytes from buffer dsi->buffer or read from socket + * + * 1. Check if there are bytes in the the dsi->buffer buffer. + * 2. Return bytes from (1) if yes. + * Note: this may return fewer bytes then requested in count !! + * 3. If the buffer was empty, read from the socket. + */ +static ssize_t buf_read(DSI *dsi, uint8_t *buf, size_t count) +{ + ssize_t len; + + LOG(log_maxdebug, logtype_dsi, "buf_read(%u bytes)", count); + + if (!count) + return 0; + + len = from_buf(dsi, buf, count); /* 1. */ + if (len) + return len; /* 2. */ + + len = readt(dsi->socket, buf, count, 0, 1); /* 3. */ + + LOG(log_maxdebug, logtype_dsi, "buf_read(%u bytes): got: %d", count, len); + + return len; +} + +/* + * Get "length" bytes from buffer and/or socket. In order to avoid frequent small reads + * this tries to read larger chunks (8192 bytes) into a buffer. + */ +static size_t dsi_buffered_stream_read(DSI *dsi, uint8_t *data, const size_t length) +{ + size_t len; + size_t buflen; + + LOG(log_maxdebug, logtype_dsi, "dsi_buffered_stream_read: %u bytes", length); + + len = from_buf(dsi, data, length); /* read from buffer dsi->buffer */ + dsi->read_count += len; + if (len == length) { /* got enough bytes from there ? */ + return len; /* yes */ + } + + /* fill the buffer with 8192 bytes or until buffer is full */ + buflen = min(8192, dsi->end - dsi->eof); + if (buflen > 0) { + ssize_t ret; + ret = read(dsi->socket, dsi->eof, buflen); + if (ret > 0) + dsi->eof += ret; + } + + /* now get the remaining data */ + if ((buflen = dsi_stream_read(dsi, data + len, length - len)) != length - len) + return 0; + len += buflen; + + return len; +} + +/* --------------------------------------- +*/ +static void block_sig(DSI *dsi) +{ + dsi->in_write++; +} + +/* --------------------------------------- +*/ +static void unblock_sig(DSI *dsi) +{ + dsi->in_write--; +} + +/********************************************************************************* + * Public functions + *********************************************************************************/ + +/*! + * Communication error with the client, enter disconnected state + * + * 1. close the socket + * 2. set the DSI_DISCONNECTED flag, remove possible sleep flags + * + * @returns 0 if successfully entered disconnected state + * -1 if ppid is 1 which means afpd master died + * or euid == 0 ie where still running as root (unauthenticated session) + */ +int dsi_disconnect(DSI *dsi) +{ + LOG(log_note, logtype_dsi, "dsi_disconnect: entering disconnected state"); + dsi->proto_close(dsi); /* 1 */ + dsi->flags &= ~(DSI_SLEEPING | DSI_EXTSLEEP); /* 2 */ + dsi->flags |= DSI_DISCONNECTED; + if (geteuid() == 0) + return -1; + return 0; +} + /* ------------------------------ * write raw data. return actual bytes read. checks against EINTR * aren't necessary if all of the signals have SA_RESTART @@ -135,10 +265,13 @@ ssize_t dsi_stream_write(DSI *dsi, void *data, const size_t length, int mode) dsi->in_write++; written = 0; - LOG(log_maxdebug, logtype_dsi, "dsi_stream_write: sending %u bytes", length); + LOG(log_maxdebug, logtype_dsi, "dsi_stream_write(send: %zd bytes): START", length); + + if (dsi->flags & DSI_DISCONNECTED) + return -1; while (written < length) { - len = send(dsi->socket, (u_int8_t *) data + written, length - written, flags); + len = send(dsi->socket, (uint8_t *) data + written, length - written, flags); if (len >= 0) { written += len; continue; @@ -171,6 +304,7 @@ ssize_t dsi_stream_write(DSI *dsi, void *data, const size_t length, int mode) } dsi->write_count += written; + LOG(log_maxdebug, logtype_dsi, "dsi_stream_write(send: %zd bytes): END", length); exit: dsi->in_write--; @@ -183,24 +317,38 @@ exit: #ifdef WITH_SENDFILE ssize_t dsi_stream_read_file(DSI *dsi, int fromfd, off_t offset, const size_t length) { + int ret = 0; size_t written; ssize_t len; + off_t pos = offset; + + LOG(log_maxdebug, logtype_dsi, "dsi_stream_read_file(send %zd bytes): START", length); - LOG(log_maxdebug, logtype_dsi, "dsi_stream_read_file: sending %u bytes", length); + if (dsi->flags & DSI_DISCONNECTED) + return -1; dsi->in_write++; written = 0; while (written < length) { - len = sys_sendfile(dsi->socket, fromfd, &offset, length - written); + len = sys_sendfile(dsi->socket, fromfd, &pos, length - written); if (len < 0) { if (errno == EINTR) continue; - if (errno == EINVAL || errno == ENOSYS) - return -1; - + 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; + } +#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. @@ -214,104 +362,61 @@ ssize_t dsi_stream_read_file(DSI *dsi, int fromfd, off_t offset, const size_t le } else if (!len) { /* afpd is going to exit */ - errno = EIO; - return -1; /* I think we're at EOF here... */ + ret = -1; + goto exit; } else written += len; } 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; } #endif -/* - * Return all bytes up to count from dsi->buffer if there are any buffered there - */ -static size_t from_buf(DSI *dsi, u_int8_t *buf, size_t count) -{ - size_t nbe = 0; - - if (dsi->buffer == NULL) - /* afpd master has no DSI buffering */ - return 0; - - LOG(log_maxdebug, logtype_dsi, "from_buf: %u bytes", count); - - nbe = dsi->eof - dsi->start; - - if (nbe > 0) { - nbe = min((size_t)nbe, count); - memcpy(buf, dsi->start, nbe); - dsi->start += nbe; - - if (dsi->eof == dsi->start) - dsi->start = dsi->eof = dsi->buffer; - } - - LOG(log_debug, logtype_dsi, "from_buf(read: %u, unread:%u , space left: %u): returning %u", - dsi->start - dsi->buffer, dsi->eof - dsi->start, dsi->end - dsi->eof, nbe); - - return nbe; -} - -/* - * Get bytes from buffer dsi->buffer or read from socket - * - * 1. Check if there are bytes in the the dsi->buffer buffer. - * 2. Return bytes from (1) if yes. - * Note: this may return fewer bytes then requested in count !! - * 3. If the buffer was empty, read from the socket. - */ -static ssize_t buf_read(DSI *dsi, u_int8_t *buf, size_t count) -{ - ssize_t len; - - LOG(log_maxdebug, logtype_dsi, "buf_read(%u bytes)", count); - - if (!count) - return 0; - - len = from_buf(dsi, buf, count); /* 1. */ - if (len) - return len; /* 2. */ - - len = readt(dsi->socket, buf, count, 0, 1); /* 3. */ - - LOG(log_maxdebug, logtype_dsi, "buf_read(%u bytes): got: %d", count, len); - - return len; -} /* * Essentially a loop around buf_read() to ensure "length" bytes are read * from dsi->buffer and/or the socket. + * + * @returns length on success, some value smaller then length indicates an error */ size_t dsi_stream_read(DSI *dsi, void *data, const size_t length) { size_t stored; ssize_t len; + if (dsi->flags & DSI_DISCONNECTED) + return 0; + LOG(log_maxdebug, logtype_dsi, "dsi_stream_read(%u bytes)", length); stored = 0; while (stored < length) { - len = buf_read(dsi, (u_int8_t *) data + stored, length - stored); + len = buf_read(dsi, (uint8_t *) data + stored, length - stored); if (len == -1 && (errno == EINTR || errno == EAGAIN)) { - LOG(log_debug, logtype_dsi, "dsi_stream_read: select read loop"); + LOG(log_maxdebug, logtype_dsi, "dsi_stream_read: select read loop"); continue; } else if (len > 0) { stored += len; } else { /* eof or error */ /* don't log EOF error if it's just after connect (OSX 10.3 probe) */ +#if 0 + if (errno == ECONNRESET) + dsi->flags |= DSI_GOT_ECONNRESET; +#endif if (len || stored || dsi->read_count) { if (! (dsi->flags & DSI_DISCONNECTED)) { LOG(log_error, logtype_dsi, "dsi_stream_read: len:%d, %s", len, (len < 0) ? strerror(errno) : "unexpected EOF"); - AFP_PANIC("FIXME"); } + return 0; } break; } @@ -323,51 +428,6 @@ size_t dsi_stream_read(DSI *dsi, void *data, const size_t length) return stored; } -/* - * Get "length" bytes from buffer and/or socket. In order to avoid frequent small reads - * this tries to read larger chunks (8192 bytes) into a buffer. - */ -static size_t dsi_buffered_stream_read(DSI *dsi, u_int8_t *data, const size_t length) -{ - size_t len; - size_t buflen; - - LOG(log_maxdebug, logtype_dsi, "dsi_buffered_stream_read: %u bytes", length); - - len = from_buf(dsi, data, length); /* read from buffer dsi->buffer */ - dsi->read_count += len; - if (len == length) { /* got enough bytes from there ? */ - return len; /* yes */ - } - - /* fill the buffer with 8192 bytes or until buffer is full */ - buflen = min(8192, dsi->end - dsi->eof); - if (buflen > 0) { - ssize_t ret; - ret = read(dsi->socket, dsi->eof, buflen); - if (ret > 0) - dsi->eof += ret; - } - - /* now get the remaining data */ - len += dsi_stream_read(dsi, data + len, length - len); - return len; -} - -/* --------------------------------------- -*/ -static void block_sig(DSI *dsi) -{ - dsi->in_write++; -} - -/* --------------------------------------- -*/ -static void unblock_sig(DSI *dsi) -{ - dsi->in_write--; -} - /* --------------------------------------- * write data. 0 on failure. this assumes that dsi_len will never * cause an overflow in the data buffer. @@ -379,8 +439,10 @@ int dsi_stream_send(DSI *dsi, void *buf, size_t length) size_t towrite; ssize_t len; - LOG(log_maxdebug, logtype_dsi, "dsi_stream_send: %u bytes", - length ? length : sizeof(block)); + LOG(log_maxdebug, logtype_dsi, "dsi_stream_send(%u bytes): START", length); + + if (dsi->flags & DSI_DISCONNECTED) + return 0; block[0] = dsi->header.dsi_flags; block[1] = dsi->header.dsi_command; @@ -392,6 +454,7 @@ int dsi_stream_send(DSI *dsi, void *buf, size_t length) sizeof(dsi->header.dsi_reserved)); if (!length) { /* just write the header */ + LOG(log_maxdebug, logtype_dsi, "dsi_stream_send(%u bytes): DSI header, no data", sizeof(block)); length = (dsi_stream_write(dsi, block, sizeof(block), 0) == sizeof(block)); return length; /* really 0 on failure, 1 on success */ } @@ -435,49 +498,52 @@ int dsi_stream_send(DSI *dsi, void *buf, size_t length) iov[1].iov_len -= len; } } + + LOG(log_maxdebug, logtype_dsi, "dsi_stream_send(%u bytes): END", length); unblock_sig(dsi); return 1; } -/* --------------------------------------- - * read data. function on success. 0 on failure. data length gets - * stored in length variable. this should really use size_t's, but - * that would require changes elsewhere. */ -int dsi_stream_receive(DSI *dsi, void *buf, const size_t ilength, - size_t *rlength) +/*! + * Read DSI command and data + * + * @param dsi (rw) DSI handle + * + * @return DSI function on success, 0 on failure + */ +int dsi_stream_receive(DSI *dsi) { char block[DSI_BLOCKSIZ]; - LOG(log_maxdebug, logtype_dsi, "dsi_stream_receive: %u bytes", ilength); + LOG(log_maxdebug, logtype_dsi, "dsi_stream_receive: START"); + + if (dsi->flags & DSI_DISCONNECTED) + return 0; /* read in the header */ - if (dsi_buffered_stream_read(dsi, (u_int8_t *)block, sizeof(block)) != sizeof(block)) + if (dsi_buffered_stream_read(dsi, (uint8_t *)block, sizeof(block)) != sizeof(block)) return 0; dsi->header.dsi_flags = block[0]; dsi->header.dsi_command = block[1]; - /* FIXME, not the right place, - but we get a server disconnect without reason in the log - */ - if (!block[1]) { - LOG(log_error, logtype_dsi, "dsi_stream_receive: invalid packet, fatal"); + + if (dsi->header.dsi_command == 0) return 0; - } - memcpy(&dsi->header.dsi_requestID, block + 2, - sizeof(dsi->header.dsi_requestID)); + memcpy(&dsi->header.dsi_requestID, block + 2, sizeof(dsi->header.dsi_requestID)); memcpy(&dsi->header.dsi_code, block + 4, sizeof(dsi->header.dsi_code)); memcpy(&dsi->header.dsi_len, block + 8, sizeof(dsi->header.dsi_len)); - memcpy(&dsi->header.dsi_reserved, block + 12, - sizeof(dsi->header.dsi_reserved)); + memcpy(&dsi->header.dsi_reserved, block + 12, sizeof(dsi->header.dsi_reserved)); dsi->clientID = ntohs(dsi->header.dsi_requestID); /* make sure we don't over-write our buffers. */ - *rlength = min(ntohl(dsi->header.dsi_len), ilength); - if (dsi_stream_read(dsi, buf, *rlength) != *rlength) + dsi->cmdlen = min(ntohl(dsi->header.dsi_len), DSI_CMDSIZ); + if (dsi_stream_read(dsi, dsi->commands, dsi->cmdlen) != dsi->cmdlen) return 0; + LOG(log_debug, logtype_dsi, "dsi_stream_receive: DSI cmdlen: %zd", dsi->cmdlen); + return block[1]; }