Review fixes I

nasa · Aug 28, 2023 · 206ebc2 · 206ebc2
1 parent c37717d
commit 206ebc2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Drv/Ip/SocketReadTask.cpp b/Drv/Ip/SocketReadTask.cpp
@@ -63,7 +63,7 @@ Os::Task::TaskStatus SocketReadTask::joinSocketTask(void** value_ptr) {
 
 void SocketReadTask::stopSocketTask() {
     this->m_stop = true;
-    this->shutdown();  // Break out of any receives and fully shutdown
+    this->getSocketHandler().shutdown();  // Break out of any receives and fully shutdown
 }
 
 void SocketReadTask::readTask(void* pointer) {
@@ -88,7 +88,7 @@ void SocketReadTask::readTask(void* pointer) {
         }
 
         // If the network connection is open, read from it
-        if (self->getSocketHandler().isOpened() and (not self->m_stop)) {
+        if (self->getSocketHandler().isStarted() and self->getSocketHandler().isOpened() and (not self->m_stop)) {
             Fw::Buffer buffer = self->getBuffer();
             U8* data = buffer.getData();
             FW_ASSERT(data);

diff --git a/Drv/Ip/SocketReadTask.hpp b/Drv/Ip/SocketReadTask.hpp
@@ -58,7 +58,7 @@ class SocketReadTask {
     /**
      * \brief startup the socket for communications
      *
-     * Startus up the socket handler.
+     * Status of the socket handler.
      *
      * Note: this just delegates to the handler
      *

diff --git a/Drv/Ip/TcpServerSocket.cpp b/Drv/Ip/TcpServerSocket.cpp
@@ -94,6 +94,7 @@ void TcpServerSocket::shutdown() {
 SocketIpStatus TcpServerSocket::openProtocol(NATIVE_INT_TYPE& fd) {
     NATIVE_INT_TYPE clientFd = -1;
     NATIVE_INT_TYPE serverFd = -1;
+
     // Check started before allowing open
     if (not this->isStarted()) {
         return SOCK_NOT_STARTED;

diff --git a/Ref/Top/CMakeLists.txt b/Ref/Top/CMakeLists.txt
@@ -17,6 +17,7 @@ set(MOD_DEPS
   # Communication Implementations
   Drv/Udp
   Drv/TcpClient
+  Drv/TcpServer
 )
 
 register_fprime_module()