Fix warnings in tcp/udp UT

Drv/Ip/IpSocket.cpp

@@ -166,8 +166,14 @@ SocketIpStatus IpSocket::recv(NATIVE_INT_TYPE fd, U8* data, U32& req_read) {
     for (U32 i = 0; (i < SOCKET_MAX_ITERATIONS) && (size <= 0); i++) {
         // Attempt to recv out data
         size = this->recvProtocol(fd, data, req_read);
+
+        // Nothing to be received
+        if ((size == -1) && (errno == EAGAIN)) {
+            req_read = 0;
+            return SOCK_SUCCESS;
+        }
         // Error is EINTR, just try again
-        if (size == -1 && ((errno == EINTR) || errno == EAGAIN)) {
+        if ((size == -1) && (errno == EINTR)) {
             continue;
         }
         // Zero bytes read reset or bad ef means we've disconnected

Drv/Ip/SocketComponentHelper.cpp

@@ -166,9 +166,9 @@ void SocketComponentHelper::readTask(void* pointer) {
             status = self->reconnect();
             if(status != SOCK_SUCCESS) {
                 Fw::Logger::log(
-                    "[WARNING] Failed to open port with status %lu and errno %lu\n",
-                    static_cast<POINTER_CAST>(status),
-                    static_cast<POINTER_CAST>(errno));
+                    "[WARNING] Failed to open port with status %d and errno %d\n",
+                    status,
+                    errno);
                 (void) Os::Task::delay(SOCKET_RETRY_INTERVAL);
                 continue;
             }
@@ -182,9 +182,9 @@ void SocketComponentHelper::readTask(void* pointer) {
             // recv blocks, so it may have been a while since its done an isOpened check
             status = self->recv(data, size);
             if ((status != SOCK_SUCCESS) && (status != SOCK_INTERRUPTED_TRY_AGAIN)) {
-                Fw::Logger::log("[WARNING] Failed to recv from port with status %lu and errno %lu\n",
-                static_cast<POINTER_CAST>(status),
-                static_cast<POINTER_CAST>(errno));
+                Fw::Logger::log("[WARNING] Failed to recv from port with status %d and errno %d\n",
+                    status,
+                    errno);
                 self->close();
                 buffer.setSize(0);
             } else {

Drv/Ip/SocketComponentHelper.hpp

@@ -97,7 +97,7 @@ class SocketComponentHelper {
      * \return true if socket is open, false otherwise
      */
     bool isOpened();
-    
+
      /**
      * \brief Re-open port if it has been disconnected
      *

Drv/TcpClient/test/ut/TcpClientTester.cpp

@@ -90,7 +90,7 @@ void TcpClientTester ::test_with_loop(U32 iterations, bool recv_thread) {
             }
         }
         // Properly stop the client on the last iteration
-        if ((1 + i) == iterations && recv_thread) {
+        if (((1 + i) == iterations) && recv_thread) {
             this->component.stop();
             this->component.join();
         } else {

Drv/TcpServer/test/ut/TcpServerTester.cpp

@@ -89,16 +89,15 @@ void TcpServerTester ::test_with_loop(U32 iterations, bool recv_thread) {
         }
 
         // Properly stop the client on the last iteration
-        if ((1 + i) == iterations && recv_thread) {
-            this->component.shutdown();
+        if (((1 + i) == iterations) && recv_thread) {
             this->component.stop();
-            client.close(client_fd); // Client must be closed first or the server risks binding to an existing address
             this->component.close();
+            client.close(client_fd); // Client must be closed first or the server risks binding to an existing address
             this->component.shutdown();
             this->component.join();
         } else {
-            client.close(client_fd); // Client must be closed first or the server risks binding to an existing address
             this->component.close();
+            client.close(client_fd); // Client must be closed first or the server risks binding to an existing address
         }
     }
     ASSERT_from_ready_SIZE(iterations);

Drv/Udp/test/ut/UdpTester.cpp

@@ -107,7 +107,7 @@ void UdpTester::test_with_loop(U32 iterations, bool recv_thread) {
             }
         }
         // Properly stop the client on the last iteration
-        if ((1 + i) == iterations && recv_thread) {
+        if (((1 + i) == iterations) && recv_thread) {
             this->component.stop();
             this->component.join();
         } else {