Fix warnings in tcp/udp UT

Drv/Ip/IpSocket.cpp

@@ -218,8 +218,13 @@ SocketIpStatus IpSocket::recv(U8* data, U32& req_read) {
     for (U32 i = 0; (i < SOCKET_MAX_ITERATIONS) && (size <= 0); i++) {
         // Attempt to recv out data
         size = this->recvProtocol(data, req_read);
+
+        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/SocketReadTask.cpp

@@ -51,34 +51,42 @@ SocketIpStatus SocketReadTask::open() {
 }
 
 void SocketReadTask::shutdown() {
+    this->m_task_lock.lock();
     this->getSocketHandler().shutdown();
+    this->m_task_lock.unlock();
 }
 
 void SocketReadTask::close() {
+    this->m_task_lock.lock();
     this->getSocketHandler().close();
+    this->m_task_lock.unlock();
 }
 
 Os::Task::Status SocketReadTask::join() {
     return m_task.join();
 }
 
 void SocketReadTask::stop() {
+    this->m_task_lock.lock();
     this->m_stop = true;
     this->getSocketHandler().shutdown();  // Break out of any receives and fully shutdown
+    this->m_task_lock.unlock();
 }
 
 void SocketReadTask::readTask(void* pointer) {
     FW_ASSERT(pointer);
     SocketIpStatus status = SOCK_SUCCESS;
     SocketReadTask* self = reinterpret_cast<SocketReadTask*>(pointer);
     do {
+        self->m_task_lock.lock();
         // Open a network connection if it has not already been open
         if ((not self->getSocketHandler().isStarted()) and (not self->m_stop) and
             ((status = self->startup()) != SOCK_SUCCESS)) {
             Fw::Logger::logMsg(
                 "[WARNING] Failed to open port with status %d and errno %d\n",
                 static_cast<POINTER_CAST>(status),
                 static_cast<POINTER_CAST>(errno));
+            self->m_task_lock.unlock();
             (void) Os::Task::delay(SOCKET_RETRY_INTERVAL);
             continue;
         }
@@ -90,6 +98,7 @@ void SocketReadTask::readTask(void* pointer) {
                 "[WARNING] Failed to open port with status %d and errno %d\n",
                 static_cast<POINTER_CAST>(status),
                 static_cast<POINTER_CAST>(errno));
+            self->m_task_lock.unlock();
             (void) Os::Task::delay(SOCKET_RETRY_INTERVAL);
             continue;
         }
@@ -113,6 +122,7 @@ void SocketReadTask::readTask(void* pointer) {
             }
             self->sendBuffer(buffer, status);
         }
+        self->m_task_lock.unlock();
     }
     // As long as not told to stop, and we are successful interrupted or ordered to retry, keep receiving
     while (not self->m_stop &&

Drv/Ip/SocketReadTask.hpp

@@ -171,7 +171,7 @@ class SocketReadTask {
     Os::Task m_task;
     bool m_reconnect; //!< Force reconnection
     bool m_stop; //!< Stops the task when set to true
-
+    Os::Mutex m_task_lock;
 };
 }
 #endif  // DRV_SOCKETREADTASK_HPP

Drv/TcpClient/test/ut/TcpClientTester.cpp

@@ -84,12 +84,13 @@ 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 {
             this->component.close();
         }
+
         server.close();
     }
     server.shutdown();

Drv/TcpServer/test/ut/TcpServerTester.cpp

@@ -87,15 +87,16 @@ void TcpServerTester ::test_with_loop(U32 iterations, bool recv_thread) {
                 while (not m_spinner) {}
             }
         }
-        client.close(); // Client must be closed first or the server risks binding to an existing address
+
         // 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();
             this->component.join();
         } else {
             this->component.close();
         }
+
+        client.close();
     }
     ASSERT_from_ready_SIZE(iterations);
 }

Drv/Udp/test/ut/UdpTester.cpp

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

Fw/Types/StringUtils.cpp

@@ -48,7 +48,7 @@ FwSignedSizeType Fw::StringUtils::substring_find(const CHAR* source_string,
         return -1;
     }
     // Confirm that the output type can hold the range of valid results
-    FW_ASSERT((source_size - sub_size) <= std::numeric_limits<FwSignedSizeType>::max());
+    FW_ASSERT(source_size - sub_size <= static_cast<FwSizeType>(std::numeric_limits<FwSignedSizeType>::max()));
 
     // Loop from zero to source_size - sub_size (inclusive)
     for (FwSizeType source_index = 0;