/*
+ * $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.
*
#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
/* this streams writes */
#include <stdio.h>
#include <string.h>
#include <atalk/dsi.h>
-#include <netatalk/endian.h>
-
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
+#include <atalk/util.h>
+#include <atalk/logger.h>
/* 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)
+size_t dsi_writeinit(DSI *dsi, void *buf, const size_t buflen _U_)
{
- const struct itimerval none = {{0, 0}, {0, 0}};
size_t len, header;
/* figure out how much data we have. do a couple checks for 0
* data */
- header = ntohl(dsi->header.dsi_code);
+ header = ntohl(dsi->header.dsi_doff);
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;
+ len = MIN(dsi->server_quantum - header, dsi->datasize);
+
+ /* write last part of command buffer into buf */
+ memmove(buf, dsi->commands + header, len);
+
+ /* recalculate remaining data */
+ dsi->datasize -= len;
} else
len = 0;
- /* deal with signals. i'm doing it this way to ensure that we don't
- * get confused if a writeflush on zero remaining data is, for some
- * reason, needed. */
- sigprocmask(SIG_BLOCK, &dsi->sigblockset, NULL);
- setitimer(ITIMER_REAL, &none, &dsi->savetimer);
+ LOG(log_maxdebug, logtype_dsi, "dsi_writeinit: len: %ju, remaining DSI datasize: %jd",
+ (intmax_t)len, (intmax_t)dsi->datasize);
+
return len;
}
{
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);
- setitimer(ITIMER_REAL, &dsi->savetimer, NULL);
- sigprocmask(SIG_UNBLOCK, &dsi->sigblockset, NULL);
+ 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;
}
else
break;
}
-
- setitimer(ITIMER_REAL, &dsi->savetimer, NULL);
- sigprocmask(SIG_UNBLOCK, &dsi->sigblockset, NULL);
}