rsocket: Return size of received data in case of error

If an error occurs processing rrecv(), we return the error.
But if we have data, we should return the size of the
available data instead.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/src/rsocket.c b/src/rsocket.c
index 074fb1872e8b51a6659467d4b0cb450287e5a841..4ff3a423c52f85118a09e98546e636465942f9fb 100644 (file)
--- a/src/rsocket.c
+++ b/src/rsocket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2008-2014 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -2394,7 +2394,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
        struct rsocket *rs;
        size_t left = len;
        uint32_t end_size, rsize;
-       int ret;
+       int ret = 0;
 
        rs = idm_at(&idm, socket);
        if (rs->type == SOCK_DGRAM) {
@@ -2421,7 +2421,6 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
                                break;
                }
 
-               ret = 0;
                if (flags & MSG_PEEK) {
                        left = len - rs_peek(rs, buf, left);
                        break;
@@ -2456,7 +2455,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
        } while (left && (flags & MSG_WAITALL) && (rs->state & rs_readable));
 
        fastlock_release(&rs->rlock);
-       return ret ? ret : len - left;
+       return (ret && left == len) ? ret : len - left;
 }
 
 ssize_t rrecvfrom(int socket, void *buf, size_t len, int flags,