Diff: Socket/TCPSocketConnection.cpp

Revision:

19:c7debad9a20a

Parent:

18:c6f67fcfc62a

Child:

24:8bff2b51ea3b

--- a/Socket/TCPSocketConnection.cpp	Fri Jun 07 13:44:59 2013 +0000
+++ b/Socket/TCPSocketConnection.cpp	Sat Jun 08 13:47:53 2013 +0000
@@ -50,7 +50,7 @@
         return -1;
     }
     
-    if (picotcp_connect(_sock_fd, (struct sockaddr *) &_remoteHost, sizeof(_remoteHost)) < 0) {
+    if (picotcp_connect(_ep, (struct sockaddr *) &_remoteHost, sizeof(_remoteHost)) < 0) {
         close();
         return -1;
     }
@@ -64,7 +64,7 @@
 }
 
 int TCPSocketConnection::send(char* data, int length) {
-    if ((_sock_fd < 0) || !_is_connected)
+    if ((_ep < 0) || !_is_connected)
         return -1;
     
     if (!_blocking) {
@@ -75,43 +75,26 @@
             return -1;
         }
     }
-    
-    int n = picotcp_write(_sock_fd, data, length);
-    _is_connected = (picotcp_state(_sock_fd) == SOCK_CONNECTED);
-    
-    return n;
+    return picotcp_write(_ep, data, length);
 }
 
 // -1 if unsuccessful, else number of bytes written
 int TCPSocketConnection::send_all(char* data, int length) {
-    if ((_sock_fd < 0) || !_is_connected)
+    if ((_ep < 0) || !_is_connected)
         return -1;
-    
-    size_t writtenLen = 0;
-    TimeInterval timeout(_timeout);
-    while (writtenLen < length) {
-        if (!_blocking) {
-            // Wait for socket to be writeable
-            if (wait_writable(timeout) != 0)
-                return writtenLen;
-        }
         
-        int ret = picotcp_write(_sock_fd, data + writtenLen, length - writtenLen);
-        if (ret > 0) {
-            writtenLen += ret;
-            continue;
-        } else if (ret == 0) {
-            _is_connected = (picotcp_state(_sock_fd) == SOCK_CONNECTED);
-            return writtenLen;
-        } else {
-            return -1; //Connnection error
+    if (!_blocking) {
+       TimeInterval timeout(_timeout);
+       // Wait for socket to be writeable
+       if (wait_writable(timeout) != 0) {
+           return 0;
         }
     }
-    return writtenLen;
+    return picotcp_write(_ep, data, length);
 }
 
 int TCPSocketConnection::receive(char* data, int length) {
-    if ((_sock_fd < 0) || !_is_connected)
+    if ((_ep < 0) || !_is_connected)
         return -1;
     
     if (!_blocking) {
@@ -122,36 +105,10 @@
             return -1;
         }
     }
-    
-    int n = picotcp_read(_sock_fd, data, length);
-    _is_connected = (picotcp_state(_sock_fd) == SOCK_CONNECTED);
-    
-    return n;
+    return picotcp_read(_ep, data, length);
 }
 
 // -1 if unsuccessful, else number of bytes received
 int TCPSocketConnection::receive_all(char* data, int length) {
-    if ((_sock_fd < 0) || !_is_connected)
-        return -1;
-    
-    size_t readLen = 0;
-    TimeInterval timeout(_timeout);
-    while (readLen < length) {
-        if (!_blocking) {
-            //Wait for socket to be readable
-            if (wait_readable(timeout) != 0)
-                return readLen;
-        }
-        
-        int ret = picotcp_read(_sock_fd, data + readLen, length - readLen);
-        if (ret > 0) {
-            readLen += ret;
-        } else if (ret == 0) {
-            _is_connected = (picotcp_state(_sock_fd) == SOCK_CONNECTED);
-            return readLen;
-        } else {
-            return -1; //Connnection error
-        }
-    }
-    return readLen;
+    return receive(data, length);
 }