/*
- * $Id: dsi_stream.c,v 1.7 2002-02-01 06:14:39 srittau Exp $
+ * $Id: dsi_stream.c,v 1.20 2009-10-26 12:35:56 franklahm Exp $
*
* Copyright (c) 1998 Adrian Sun (asun@zoology.washington.edu)
* All rights reserved. See COPYRIGHT.
#include <stdio.h>
#include <stdlib.h>
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#endif
+
#include <string.h>
#include <errno.h>
#include <sys/types.h>
+#include <sys/socket.h>
+
#ifdef USE_WRITEV
#include <sys/uio.h>
-#endif /* USE_WRITEV */
-#include <atalk/logger.h>
+#endif
+#include <atalk/logger.h>
#include <atalk/dsi.h>
#include <netatalk/endian.h>
+#include <atalk/util.h>
#define min(a,b) ((a) < (b) ? (a) : (b))
+#ifndef MSG_MORE
+#define MSG_MORE 0x8000
+#endif
+
+#ifndef MSG_DONTWAIT
+#define MSG_DONTWAIT 0x40
+#endif
+
+/* -------------------------
+ * we don't use a circular buffer.
+*/
+static void dsi_init_buffer(DSI *dsi)
+{
+ if (!dsi->buffer) {
+ /* XXX config options */
+ dsi->maxsize = 6 * dsi->server_quantum;
+ if (!dsi->maxsize)
+ dsi->maxsize = 6 * DSI_SERVQUANT_DEF;
+ dsi->buffer = malloc(dsi->maxsize);
+ if (!dsi->buffer) {
+ return;
+ }
+ dsi->start = dsi->buffer;
+ dsi->eof = dsi->buffer;
+ dsi->end = dsi->buffer + dsi->maxsize;
+ }
+}
+
+/* ----------------------
+ afpd is sleeping too much while trying to send something.
+ May be there's no reader or the reader is also sleeping in write,
+ look if there's some data for us to read, hopefully it will wake up
+ the reader so we can write again.
+*/
+static int dsi_peek(DSI *dsi)
+{
+ fd_set readfds, writefds;
+ int len;
+ int maxfd;
+ int ret;
+
+ FD_ZERO(&readfds);
+ FD_ZERO(&writefds);
+ FD_SET( dsi->socket, &readfds);
+ FD_SET( dsi->socket, &writefds);
+ maxfd = dsi->socket +1;
-/* write raw data. return actual bytes read. checks against EINTR
+ while (1) {
+ FD_SET( dsi->socket, &readfds);
+ FD_SET( dsi->socket, &writefds);
+
+ /* No timeout: if there's nothing to read nor nothing to write,
+ * we've got nothing to do at all */
+ if ((ret = select( maxfd, &readfds, &writefds, NULL, NULL)) <= 0) {
+ if (ret == -1 && errno == EINTR)
+ /* we might have been interrupted by out timer, so restart select */
+ continue;
+ /* give up */
+ break;
+ }
+
+ /* Check if there's sth to read, hopefully reading that will unblock the client */
+ if (FD_ISSET(dsi->socket, &readfds)) {
+ dsi_init_buffer(dsi);
+ len = dsi->end - dsi->eof;
+
+ if (len <= 0) {
+ /* ouch, our buffer is full ! fall back to blocking IO
+ * could block and disconnect but it's better than a cpu hog */
+ break;
+ }
+
+ len = read(dsi->socket, dsi->eof, len);
+ if (len <= 0)
+ break;
+ dsi->eof += len;
+ }
+
+ if (FD_ISSET(dsi->socket, &writefds))
+ /* we can write again at last */
+ break;
+ }
+
+ return 0;
+}
+
+/* ------------------------------
+ * write raw data. return actual bytes read. checks against EINTR
* aren't necessary if all of the signals have SA_RESTART
* specified. */
-size_t dsi_stream_write(DSI *dsi, void *data, const size_t length)
+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;
+ dsi->in_write++;
written = 0;
+
+ LOG(log_maxdebug, logtype_dsi, "dsi_stream_write: sending %u bytes", length);
+
+ /* non blocking mode */
+ if (setnonblock(dsi->socket, 1) < 0) {
+ LOG(log_error, logtype_dsi, "dsi_stream_write: setnonblock: %s", strerror(errno));
+ return -1;
+ }
+
while (written < length) {
- if (((len = write(dsi->socket, (u_int8_t *) data + written,
- length - written)) == -1 && errno == EINTR) ||
- !len)
- continue;
+ len = send(dsi->socket, (u_int8_t *) data + written, length - written, flags);
+ if (len >= 0) {
+ written += len;
+ continue;
+ }
+
+ if (errno == EINTR)
+ continue;
+
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ if (mode == DSI_NOWAIT && written == 0) {
+ /* DSI_NOWAIT is used by attention give up in this case. */
+ written = -1;
+ goto exit;
+ }
+
+ /* Try to read sth. in order to break up possible deadlock */
+ if (dsi_peek(dsi) != 0) {
+ written = -1;
+ goto exit;
+ }
+ /* Now try writing again */
+ continue;
+ }
+ LOG(log_error, logtype_dsi, "dsi_stream_write: %s", strerror(errno));
+ written = -1;
+ goto exit;
+ }
+
+ dsi->write_count += written;
+
+exit:
+ if (setnonblock(dsi->socket, 0) < 0) {
+ LOG(log_error, logtype_dsi, "dsi_stream_write: setnonblock: %s", strerror(errno));
+ written = -1;
+ }
+
+ dsi->in_write--;
+ return written;
+}
+
+
+/* ---------------------------------
+*/
+#ifdef WITH_SENDFILE
+ssize_t dsi_stream_read_file(DSI *dsi, int fromfd, off_t offset, const size_t length)
+{
+ size_t written;
+ ssize_t len;
+
+ dsi->in_write++;
+ written = 0;
+
+ /* non blocking mode */
+ if (setnonblock(dsi->socket, 1) < 0) {
+ LOG(log_error, logtype_dsi, "dsi_stream_read_file: setnonblock: %s", strerror(errno));
+ return -1;
+ }
+
+ while (written < length) {
+ len = sys_sendfile(dsi->socket, fromfd, &offset, length - written);
+
if (len < 0) {
- LOG(log_error, logtype_default, "dsi_stream_write: %s", strerror(errno));
+ if (errno == EINTR)
+ continue;
+ if (errno == EINVAL || errno == ENOSYS)
+ return -1;
+
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ 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_write: %s", strerror(errno));
break;
}
-
- written += len;
+ else if (!len) {
+ /* afpd is going to exit */
+ errno = EIO;
+ return -1; /* I think we're at EOF here... */
+ }
+ else
+ written += len;
+ }
+
+ if (setnonblock(dsi->socket, 0) < 0) {
+ LOG(log_error, logtype_dsi, "dsi_stream_read_file: setnonblock: %s", strerror(errno));
+ return -1;
}
dsi->write_count += written;
+ dsi->in_write--;
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->start) {
+ 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;
+
+ }
+ }
+ 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 nbe;
+
+ if (!count)
+ return 0;
+
+ nbe = from_buf(dsi, buf, count); /* 1. */
+ if (nbe)
+ return nbe; /* 2. */
+
+ return read(dsi->socket, buf, count); /* 3. */
+}
-/* read raw data. return actual bytes read. this will wait until
- * it gets length bytes */
+/*
+ * Essentially a loop around buf_read() to ensure "length" bytes are read
+ * from dsi->buffer and/or the socket.
+ */
size_t dsi_stream_read(DSI *dsi, void *data, const size_t length)
{
size_t stored;
ssize_t len;
-
+
stored = 0;
while (stored < length) {
- len = read(dsi->socket, (u_int8_t *) data + stored, length - stored);
- if (len == -1 && errno == EINTR)
+ len = buf_read(dsi, (u_int8_t *) data + stored, length - stored);
+ if (len == -1 && errno == EINTR) {
continue;
- else if (len > 0)
+ } else if (len > 0) {
stored += len;
- else { /* eof or error */
- LOG(log_error, logtype_default, "dsi_stream_read(%d): %s", len, (len < 0)?strerror(errno):"unexpected EOF");
+ } else { /* eof or error */
+ /* don't log EOF error if it's just after connect (OSX 10.3 probe) */
+ if (len || stored || dsi->read_count) {
+ if (! (dsi->flags & DSI_DISCONNECTED))
+ LOG(log_error, logtype_dsi, "dsi_stream_read(fd: %i): len:%d, %s",
+ dsi->socket, len, (len < 0) ? strerror(errno) : "unexpected EOF");
+ }
break;
}
}
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;
+
+ dsi_init_buffer(dsi);
+ 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;
+}
+
+/* ---------------------------------------
+*/
+void dsi_sleep(DSI *dsi, const int state)
+{
+ if (state)
+ dsi->flags |= DSI_SLEEPING;
+ else
+ dsi->flags &= ~DSI_SLEEPING;
+}
+
+/* ---------------------------------------
+*/
+static void block_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. */
+/* ---------------------------------------
+*/
+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.
+ */
int dsi_stream_send(DSI *dsi, void *buf, size_t length)
{
char block[DSI_BLOCKSIZ];
- sigset_t oldset;
#ifdef USE_WRITEV
struct iovec iov[2];
- size_t towrite;
+ size_t towrite;
ssize_t len;
#endif /* USE_WRITEV */
memcpy(block + 12, &dsi->header.dsi_reserved,
sizeof(dsi->header.dsi_reserved));
- /* block signals */
- sigprocmask(SIG_BLOCK, &dsi->sigblockset, &oldset);
-
if (!length) { /* just write the header */
- length = (dsi_stream_write(dsi, block, sizeof(block)) == sizeof(block));
- sigprocmask(SIG_SETMASK, &oldset, NULL);
+ length = (dsi_stream_write(dsi, block, sizeof(block), 0) == sizeof(block));
return length; /* really 0 on failure, 1 on success */
}
+ /* block signals */
+ block_sig(dsi);
#ifdef USE_WRITEV
iov[0].iov_base = block;
iov[0].iov_len = sizeof(block);
!len)
continue;
- if (len == towrite) /* wrote everything out */
+ if ((size_t)len == towrite) /* wrote everything out */
break;
else if (len < 0) { /* error */
- LOG(log_error, logtype_default, "dsi_stream_send: %s", strerror(errno));
- sigprocmask(SIG_SETMASK, &oldset, NULL);
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ if (!dsi_peek(dsi)) {
+ continue;
+ }
+ }
+ LOG(log_error, logtype_dsi, "dsi_stream_send: %s", strerror(errno));
+ unblock_sig(dsi);
return 0;
}
#else /* USE_WRITEV */
/* write the header then data */
- if ((dsi_stream_write(dsi, block, sizeof(block)) != sizeof(block)) ||
- (dsi_stream_write(dsi, buf, length) != length)) {
- sigprocmask(SIG_SETMASK, &oldset, NULL);
- return 0;
+ if ((dsi_stream_write(dsi, block, sizeof(block), 1) != sizeof(block)) ||
+ (dsi_stream_write(dsi, buf, length, 0) != length)) {
+ unblock_sig(dsi);
+ return 0;
}
#endif /* USE_WRITEV */
- sigprocmask(SIG_SETMASK, &oldset, NULL);
+ unblock_sig(dsi);
return 1;
}
-/* read data. function on success. 0 on failure. data length gets
+/* ---------------------------------------
+ * 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 int ilength,
- int *rlength)
+int dsi_stream_receive(DSI *dsi, void *buf, const size_t ilength,
+ size_t *rlength)
{
char block[DSI_BLOCKSIZ];
/* read in the header */
- if (dsi_stream_read(dsi, block, sizeof(block)) != sizeof(block))
+ if (dsi_buffered_stream_read(dsi, (u_int8_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");
+ return 0;
+ }
+
memcpy(&dsi->header.dsi_requestID, block + 2,
sizeof(dsi->header.dsi_requestID));
memcpy(&dsi->header.dsi_code, block + 4, sizeof(dsi->header.dsi_code));
projects / netatalk.git / blobdiff