Diff: Socket.cpp

Branch:

api-changes

Revision:

48:b3bbe28a7963

Parent:

45:c8aca7c1e93f

Child:

49:85fe0b99948d

--- a/Socket.cpp	Thu Feb 25 21:58:46 2016 +0000
+++ b/Socket.cpp	Thu Feb 25 03:13:26 2016 -0600
@@ -141,19 +141,26 @@
     return err;
 }
 
-int32_t Socket::send(const void *data, uint32_t len)
+int32_t Socket::send(const void *data, uint32_t size)
 {
     if (!_socket) {
         return NS_ERROR_NO_CONNECTION;
     }
-    return _socket->send(data, len);
+    return _socket->send(data, size);
 }
 
-int32_t Socket::recv(void *data, uint32_t len)
+int32_t Socket::recv(void *data, uint32_t size, bool blocking)
 {
     if (!_socket) {
         return NS_ERROR_NO_CONNECTION;
     }
-    return _socket->recv(data, len);
+
+    while (true) {
+        int32_t size = _socket->recv(data, size);
+
+        if (size != 0 || !blocking) {
+            return size;
+        }
+    }
 }