Switch time() calls to monotonic clock calls (#7597)

[libt2n] / src / socket_handler.cpp

diff --git a/src/socket_handler.cpp b/src/socket_handler.cpp
index 13e5a45..f1f5ef7 100644 (file)
--- a/src/socket_handler.cpp
+++ b/src/socket_handler.cpp
@@ -236,49 +236,55 @@ bool socket_handler::fill_buffer(std::string& buffer, long long usec_timeout, lo
 */
 bool socket_handler::fill_buffer(std::string& buffer)
 {
-    bool try_again=false;
-
     char socket_buffer[recv_buffer_size];
 
-    int nbytes = read (sock, socket_buffer, recv_buffer_size);
+    const int loop_max = 32;            /* limit is 32 * (default) 2048 bytes -> 65536 bytes in one go */
+    int loop_count = 0;
 
-    if (nbytes < 0)
+    bool read_something = false;
+    while (loop_count < loop_max)
     {
-        if (errno == EAGAIN)
-            return false;                // no data was waiting
-        else if (errno == EINTR)
+        const int nbytes = read(sock, socket_buffer, recv_buffer_size);
+
+        if (nbytes < 0)
         {
-            // interrupted, try again
-            LOGSTREAM(debug,"EINTR received on read(), trying again");
-            try_again=true;
+            if (errno == EAGAIN || errno == EWOULDBLOCK)
+                return read_something;                // no (more) data was waiting
+            else if (errno == EINTR)
+            {
+                // interrupted, try again
+                LOGSTREAM(debug, "EINTR received on read(), trying again");
+            } else
+                EXCEPTIONSTREAM(error, t2n_transfer_error, "error reading from socket : " << strerror(errno));
         }
-        else
-            EXCEPTIONSTREAM(error,t2n_transfer_error,"error reading from socket : " << strerror(errno));
-    }
 
-    // End-of-file
-    if (nbytes == 0 && !try_again)
-    {
-        LOGSTREAM(debug,"0 bytes received on read(), closing connection");
-        close();
-        return false;
-    }
+        // End-of-file
+        if (nbytes == 0)
+        {
+            LOGSTREAM(debug, "0 bytes received on read(), closing connection");
+            close();
+            return read_something;
+        }
 
-    // Data read -> store it
-    if (nbytes > 0)
-    {
-        buffer.append(socket_buffer,nbytes);
-        LOGSTREAM(debug,nbytes << " bytes read");
-    }
+        // Data read -> store it
+        if (nbytes > 0)
+        {
+            buffer.append(socket_buffer, nbytes);
+            LOGSTREAM(debug, nbytes << " bytes read");
+            read_something = true;
+        }
 
-    // more data waiting -> recurse
-    if (data_waiting(0))
-        fill_buffer(buffer);
+        // more data waiting -> loop once more (up to loop_max)
+        if (data_waiting(0))
+        {
+            ++loop_count;
+        } else
+        {
+            break;
+        }
+    }
 
-    if (nbytes > 0)
-        return true;
-    else
-        return false;
+    return read_something;
 }
 
 /// writes raw data to the socket. Don't use directly, use the write() function provided by the 
@@ -295,10 +301,10 @@ void socket_handler::socket_write(const std::string& data)
 
         int rtn;
         while ((rtn=::write(sock, data.data()+offset, write_size)) == -1 &&
-               (errno == EAGAIN || errno == EINTR))
+               (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR))
         {
             wait_ready_to_write(sock,write_timeout);
-            LOGSTREAM(debug,"resuming write() call after EAGAIN or EINTR");
+            LOGSTREAM(debug,"resuming write() call after EAGAIN or EINTR or EWOULDBLOCK");
         }
 
         if (rtn == -1)