Changeset 1065 for trunk

Timestamp:

07/21/08 14:37:19 (4 years ago)

Author:

aj

Message:

Chaskiel Grundman:
This uncovered an issue in openct. namely, that eutron_recv doesn't wait
long enough. (my device sent a wtx request after 23 loops, but we abort
after 20). Also, eutron_recv returns short writes to its caller, even
though t1_xcv cannot deal with that at all.

This patch fixes those things, as well as changes a memcpy of overlapping
memory areas to a memmove.

File:

• trunk/src/ifd/ifd-eutron.c (modified) (2 diffs)

trunk/src/ifd/ifd-eutron.c

@@ -171 +171 @@
         /* move the data to the beginning of the buffer, so there's a big
          * contiguous chunk */
-        memcpy(priv->readbuffer, &priv->readbuffer[priv->tail],
+        memmove(priv->readbuffer, &priv->readbuffer[priv->tail],
                priv->head - priv->tail);
         priv->head -= priv->tail;
         /* since we set tail=0 here, the rest of the function can ignore it */
         priv->tail = 0;
-        for (c = 0; c < 20; c++) {
+        for (c = 0; c < 30; c++) {
                 rbs = 499 - priv->head;
                 if (rbs == 0)
@@ -194 +194 @@
         }
         if (len > priv->head)
-                len = priv->head;
+                return -1;
         memcpy(buffer, priv->readbuffer, len);
         priv->tail += len;