Fix data corruption bug

[netatalk.git] / libatalk / dsi / dsi_write.c

diff --git a/libatalk/dsi/dsi_write.c b/libatalk/dsi/dsi_write.c
index 59f8e387191e7eb0fe5abdc18177b2eea846014c..1cf25e64c6516ea65e4144f63eafcd625fdb72d2 100644 (file)
--- a/libatalk/dsi/dsi_write.c
+++ b/libatalk/dsi/dsi_write.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_write.c,v 1.4 2005-04-28 20:50:02 bfernhomberg Exp $
+ * $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.
@@ -13,57 +13,43 @@
 
 /* this streams writes */
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <string.h>
 
 #include <atalk/dsi.h>
-#include <netatalk/endian.h>
-
-#ifndef MIN
-#define MIN(a,b)     ((a) < (b) ? (a) : (b))
-#endif /* ! MIN */
+#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 _U_)
 {
-#ifdef TIMER_ON_READ
-  const struct itimerval none = {{0, 0}, {0, 0}};
-#endif  
   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;
 
-#ifdef TIMER_ON_READ
-  /* 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, &dsi->oldset);
-  dsi->sigblocked = 1;
-  setitimer(ITIMER_REAL, &none, &dsi->savetimer);
-#endif  
+  LOG(log_maxdebug, logtype_dsi, "dsi_writeinit: len: %ju, remaining DSI datasize: %jd",
+      (intmax_t)len, (intmax_t)dsi->datasize);
+
   return len;
 }
 
@@ -74,15 +60,15 @@ size_t dsi_write(DSI *dsi, void *buf, const size_t buflen)
 {
   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;
+      }
   }
-#ifdef TIMER_ON_READ
-  setitimer(ITIMER_REAL, &dsi->savetimer, NULL);
-  sigprocmask(SIG_SETMASK, &dsi->oldset, NULL);
-#endif
   return 0;
 }
 
@@ -99,8 +85,4 @@ void dsi_writeflush(DSI *dsi)
     else
       break;
   }
-#ifdef TIMER_ON_READ
-  setitimer(ITIMER_REAL, &dsi->savetimer, NULL);
-  sigprocmask(SIG_SETMASK, &dsi->oldset, NULL);
-#endif  
 }