- Fixed FTP client server infinite recursion - ftp server and clients can be installed on the same node, this could cause a loop of requests

- fixed tests broken by merged with dev

src/primaite/simulator/system/services/ftp/ftp_client.py

@@ -97,6 +97,9 @@ class FTPClient(FTPServiceABC):
                     self._connect_to_server(
                         dest_ip_address=dest_ip_address, dest_port=dest_port, session_id=session_id, is_reattempt=True
                     )
+        else:
+            self.sys_log.error(f"{self.name}: Unable to send FTPPacket")
+            return False
 
     def _disconnect_from_server(
         self, dest_ip_address: Optional[IPv4Address] = None, dest_port: Optional[Port] = Port.FTP
@@ -247,30 +250,6 @@ class FTPClient(FTPServiceABC):
                 self.sys_log.error(f"{self.name}: File {src_folder_name}/{src_file_name} does not exist in FTP server")
                 return False
 
-    def send(
-        self,
-        payload: FTPPacket,
-        session_id: Optional[str] = None,
-        dest_ip_address: Optional[IPv4Address] = None,
-        dest_port: Optional[Port] = None,
-        **kwargs,
-    ) -> bool:
-        """
-        Sends a payload to the SessionManager.
-
-        :param payload: The payload to be sent.
-        :param dest_ip_address: The ip address of the payload destination.
-        :param dest_port: The port of the payload destination.
-        :param session_id: The Session ID the payload is to originate from. Optional.
-
-        :return: True if successful, False otherwise.
-        """
-        self.sys_log.info(f"{self.name}: Sending FTP {payload.ftp_command.name} {payload.ftp_command_args}")
-
-        return super().send(
-            payload=payload, dest_ip_address=dest_ip_address, dest_port=dest_port, session_id=session_id, **kwargs
-        )
-
     def receive(self, payload: FTPPacket, session_id: Optional[str] = None, **kwargs) -> bool:
         """
         Receives a payload from the SessionManager.
@@ -285,5 +264,8 @@ class FTPClient(FTPServiceABC):
             self.sys_log.error(f"{payload} is not an FTP packet")
             return False
 
+        if payload.status_code is None:
+            return False
+
         self._process_ftp_command(payload=payload, session_id=session_id)
         return True

src/primaite/simulator/system/services/ftp/ftp_server.py

@@ -38,9 +38,11 @@ class FTPServer(FTPServiceABC):
         :param: session_id: session ID linked to the FTP Packet. Optional.
         :type: session_id: Optional[str]
         """
+        # error code by default
+        payload.status_code = FTPStatusCode.ERROR
+
         # if server service is down, return error
         if self.operating_state != ServiceOperatingState.RUNNING:
-            payload.status_code = FTPStatusCode.ERROR
             self.sys_log.error("FTP Server not running")
             return payload
 
@@ -61,9 +63,13 @@ class FTPServer(FTPServiceABC):
                 payload.status_code = FTPStatusCode.OK
                 return payload
 
+            self.sys_log.error(f"Invalid Port {payload.ftp_command_args}")
+            return payload
+
         if payload.ftp_command == FTPCommand.QUIT:
             self.connections.pop(session_id)
             payload.status_code = FTPStatusCode.OK
+            return payload
 
         return super()._process_ftp_command(payload=payload, session_id=session_id, **kwargs)
 
@@ -73,5 +79,11 @@ class FTPServer(FTPServiceABC):
             self.sys_log.error(f"{payload} is not an FTP packet")
             return False
 
+        """
+        Usually
+        """
+        if payload.status_code is not None:
+            return False
+
         self.send(self._process_ftp_command(payload=payload, session_id=session_id), session_id)
         return True