hal/*/ops/ll_io_eth.c: fix disconnected endpoint on recv ()

On calling recv () a return value of 0 means that the peer (endpoint) has disconnected. In our case, we should return an error as to avoid infinitely looping over the receiving function

hal/*/ops/ll_io_eth.c: fix disconnected endpoint on recv ()
On calling recv () a return value of 0 means that the peer (endpoint) has disconnected. In our case, we should return an error as to avoid infinitely looping over the receiving function
a298a3ba · Lucas Russo · Henrique Silva · 8a7473a0 · a298a3ba
Commit a298a3ba authored Mar 10, 2015 by Lucas Russo Committed by Henrique Silva Mar 27, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 5 deletions

ll_io_eth.c hal/ll_io/ops/ll_io_eth.c +16 -5

No files found.
--- a/hal/ll_io/ops/ll_io_eth.c
+++ b/hal/ll_io/ops/ll_io_eth.c
@@ -408,14 +408,17 @@ static ssize_t _eth_sendall (int fd, uint8_t *buf, size_t len)
    size_t bytesleft = len;  /* how many we have left to send */
    ssize_t n;

-    DBE_DEBUG (DBG_LL_IO | DBG_LVL_INFO, "[ll_io_eth] Sending %lu bytes\n", len);
+    DBE_DEBUG (DBG_LL_IO | DBG_LVL_TRACE, "[ll_io_eth] Sending %lu bytes\n", len);

    while (total < len) {
        n = send (fd, (char *) buf+total, bytesleft, 0);
-        DBE_DEBUG (DBG_LL_IO | DBG_LVL_INFO, "[ll_io_eth] Sent %ld bytes\n", n);
+        DBE_DEBUG (DBG_LL_IO | DBG_LVL_TRACE, "[ll_io_eth] Sent %ld bytes\n", n);
+
+        /* On error, don't try to recover, just inform it to the caller*/
        if (n == -1) {
            return -1;
        }
+
        total += n;
        bytesleft -= n;
    }
@@ -429,14 +432,22 @@ static ssize_t _eth_recvall (int fd, uint8_t *buf, size_t len)
    size_t bytesleft = len; /* how many we have left to recv */
    ssize_t n;

-    DBE_DEBUG (DBG_LL_IO | DBG_LVL_INFO, "[ll_io_eth] Receiving %lu bytes\n", len);
+    DBE_DEBUG (DBG_LL_IO | DBG_LVL_TRACE, "[ll_io_eth] Receiving %lu bytes\n", len);

    while (total < len) {
        n = recv (fd, (char *) buf+total, bytesleft, 0);
-        DBE_DEBUG (DBG_LL_IO | DBG_LVL_INFO, "[ll_io_eth] Received %ld bytes\n", n);
+        DBE_DEBUG (DBG_LL_IO | DBG_LVL_TRACE, "[ll_io_eth] Received %ld bytes\n", n);
+
+        /* On error, don't try to recover, just inform it to the caller*/
        if (n == -1) {
-            break;
+            return -1;
        }
+
+        /* Disconnected endpoint */
+        if (n == 0) {
+            return -1;
+        }
+
        total += n;
        bytesleft -= n;
    }