Add wolfCLU_Recv wrapper and refactor all raw send()/recv() calls

Author: julek-wolfssl

src/client/client.c

@@ -1192,7 +1192,7 @@ static int StartTLS_Init(SOCKET_T* sockfd)
 
     /* S: 220 <host> SMTP service ready */
     XMEMSET(tmpBuf, 0, sizeof(tmpBuf));
-    if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0)
+    if (wolfCLU_Recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1) < 0)
         err_sys("failed to read STARTTLS command\n");
 
     if (!XSTRNCMP(tmpBuf, starttlsCmd[0], XSTRLEN(starttlsCmd[0]))) {
@@ -1202,13 +1202,14 @@ static int StartTLS_Init(SOCKET_T* sockfd)
     }
 
     /* C: EHLO mail.example.com */
-    if (send(*sockfd, starttlsCmd[1], (int)XSTRLEN(starttlsCmd[1]), 0) !=
+    if (wolfCLU_SendAll(*sockfd, starttlsCmd[1],
+              (int)XSTRLEN(starttlsCmd[1])) !=
               (int)XSTRLEN(starttlsCmd[1]))
         err_sys("failed to send STARTTLS EHLO command\n");
 
     /* S: 250 <host> offers a warm hug of welcome */
     XMEMSET(tmpBuf, 0, sizeof(tmpBuf));
-    if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0)
+    if (wolfCLU_Recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1) < 0)
         err_sys("failed to read STARTTLS command\n");
 
     if (!XSTRNCMP(tmpBuf, starttlsCmd[2], XSTRLEN(starttlsCmd[2]))) {
@@ -1218,14 +1219,15 @@ static int StartTLS_Init(SOCKET_T* sockfd)
     }
 
     /* C: STARTTLS */
-    if (send(*sockfd, starttlsCmd[3], (int)XSTRLEN(starttlsCmd[3]), 0) !=
+    if (wolfCLU_SendAll(*sockfd, starttlsCmd[3],
+              (int)XSTRLEN(starttlsCmd[3])) !=
               (int)XSTRLEN(starttlsCmd[3])) {
         err_sys("failed to send STARTTLS command\n");
     }
 
     /* S: 220 Go ahead */
     XMEMSET(tmpBuf, 0, sizeof(tmpBuf));
-    if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0)
+    if (wolfCLU_Recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1) < 0)
         err_sys("failed to read STARTTLS command\n");
     tmpBuf[sizeof(tmpBuf)-1] = '\0';
     if (!XSTRNCMP(tmpBuf, starttlsCmd[4], XSTRLEN(starttlsCmd[4]))) {

src/tools/clu_http.c

@@ -265,8 +265,8 @@ int wolfCLU_HttpServerRecv(SOCKET_T clientfd, byte* buffer, int bufferSz)
     int headerSz = 0;
 
     while (totalLen < bufferSz - 1) {
-        int n = (int)recv(clientfd, (char*)buffer + totalLen,
-                     (size_t)(bufferSz - 1 - totalLen), 0);
+        int n = wolfCLU_Recv(clientfd, (char*)buffer + totalLen,
+                     bufferSz - 1 - totalLen);
         if (n <= 0)
             break;
         totalLen += n;
@@ -295,6 +295,22 @@ int wolfCLU_HttpServerRecv(SOCKET_T clientfd, byte* buffer, int bufferSz)
     return totalLen;
 }
 
+/* Receive bytes, retrying on EINTR */
+int wolfCLU_Recv(SOCKET_T sockfd, char* buf, int len)
+{
+    int n;
+    do {
+        n = (int)recv(sockfd, buf, (size_t)len, 0);
+    } while (
+#ifndef _WIN32
+        n < 0 && errno == EINTR
+#else
+        0
+#endif
+    );
+    return n;
+}
+
 /* Send all bytes, looping on partial writes and EINTR */
 int wolfCLU_SendAll(SOCKET_T sockfd, const char* buf, int len)
 {

src/tools/clu_scgi.c

@@ -69,9 +69,10 @@
 static int readExactly(SOCKET_T sockfd, byte* buffer, int n)
 {
     int totalRead = 0;
-    
+
     while (totalRead < n) {
-        int ret = (int)recv(sockfd, (char*)buffer + totalRead, n - totalRead, 0);
+        int ret = wolfCLU_Recv(sockfd, (char*)buffer + totalRead,
+                               n - totalRead);
         if (ret <= 0) {
             return -1;
         }
@@ -85,11 +86,11 @@ static int parseNetstringLength(SOCKET_T sockfd, int* length)
 {
     char lenBuf[16];
     int i = 0;
-    
+
     *length = 0;
-    
+
     while (i < (int)sizeof(lenBuf) - 1) {
-        int ret = (int)recv(sockfd, &lenBuf[i], 1, 0);
+        int ret = wolfCLU_Recv(sockfd, &lenBuf[i], 1);
         if (ret <= 0) {
             return -1;
         }
@@ -103,7 +104,7 @@ static int parseNetstringLength(SOCKET_T sockfd, int* length)
         }
         i++;
     }
-    
+
     return -1;
 }
 

wolfclu/clu_header_main.h

@@ -712,6 +712,15 @@ int wolfCLU_HttpServerSendError(SOCKET_T clientfd, int statusCode,
  */
 void wolfCLU_ServerClose(SOCKET_T sockfd);
 
+/**
+ * @brief Receive bytes from a socket, retrying on EINTR
+ * @param sockfd socket descriptor
+ * @param buf buffer to receive into
+ * @param len maximum number of bytes to receive
+ * @return number of bytes received, 0 on connection closed, negative on error
+ */
+int wolfCLU_Recv(SOCKET_T sockfd, char* buf, int len);
+
 /**
  * @brief Send all bytes on a socket, looping on partial writes and EINTR
  * @param sockfd socket descriptor