/*
- * $Id: dsi_write.c,v 1.5 2009-10-20 04:31:41 didg Exp $
*
* Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
* All rights reserved. See COPYRIGHT.
#include <string.h>
#include <atalk/dsi.h>
+#include <atalk/util.h>
+#include <atalk/logger.h>
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif /* ! MIN */
-
-/* initialize relevant things for dsi_write. this returns the amount
- * of data in the data buffer. the interface has been reworked to allow
- * for arbitrary buffers. */
size_t dsi_writeinit(DSI *dsi, void *buf, const size_t buflen _U_)
{
- size_t len, header;
+ size_t bytes = 0;
+ dsi->datasize = ntohl(dsi->header.dsi_len) - dsi->header.dsi_data.dsi_doff;
+
+ if (dsi->eof > dsi->start) {
+ /* We have data in the buffer */
+ bytes = MIN(dsi->eof - dsi->start, dsi->datasize);
+ memmove(buf, dsi->start, bytes);
+ dsi->start += bytes;
+ dsi->datasize -= bytes;
+ if (dsi->start >= dsi->eof)
+ dsi->start = dsi->eof = dsi->buffer;
+ }
- /* figure out how much data we have. do a couple checks for 0
- * data */
- header = ntohl(dsi->header.dsi_code);
- dsi->datasize = header ? ntohl(dsi->header.dsi_len) - header : 0;
- if (dsi->datasize > 0) {
- len = MIN(sizeof(dsi->commands) - header, dsi->datasize);
-
- /* write last part of command buffer into buf */
- memcpy(buf, dsi->commands + header, len);
-
- /* recalculate remaining data */
- dsi->datasize -= len;
- } else
- len = 0;
+ LOG(log_maxdebug, logtype_dsi, "dsi_writeinit: remaining DSI datasize: %jd", (intmax_t)dsi->datasize);
- return len;
+ return bytes;
}
+
/* fill up buf and then return. this should be called repeatedly
* until all the data has been read. i block alarm processing
* during the transfer to avoid sending unnecessary tickles. */
{
size_t length;
- if (((length = MIN(buflen, dsi->datasize)) > 0) &&
- ((length = dsi_stream_read(dsi, buf, length)) > 0)) {
- dsi->datasize -= length;
- return length;
+ LOG(log_maxdebug, logtype_dsi, "dsi_write: remaining DSI datasize: %jd", (intmax_t)dsi->datasize);
+
+ if ((length = MIN(buflen, dsi->datasize)) > 0) {
+ if ((length = dsi_stream_read(dsi, buf, length)) > 0) {
+ LOG(log_maxdebug, logtype_dsi, "dsi_write: received: %ju", (intmax_t)length);
+ dsi->datasize -= length;
+ return length;
+ }
}
return 0;
}