Merge branch 'dev' into feature/2457-Set_link_bandwidth_via_config

src/primaite/simulator/network/airspace.py

@@ -192,7 +192,6 @@ class WirelessNetworkInterface(NetworkInterface, ABC):
         # Cannot send Frame as the network interface is not enabled
         return False
 
-    @abstractmethod
     def receive_frame(self, frame: Frame) -> bool:
         """
         Receives a network frame on the network interface.
@@ -200,7 +199,13 @@ class WirelessNetworkInterface(NetworkInterface, ABC):
         :param frame: The network frame being received.
         :return: A boolean indicating whether the frame was successfully received.
         """
-        pass
+        if self.enabled:
+            frame.set_sent_timestamp()
+            self.pcap.capture_inbound(frame)
+            self._connected_node.receive_frame(frame, self)
+            return True
+        # Cannot receive Frame as the network interface is not enabled
+        return False
 
 
 class IPWirelessNetworkInterface(WirelessNetworkInterface, Layer3Interface, ABC):

src/primaite/simulator/network/hardware/base.py

@@ -1378,7 +1378,7 @@ class Node(SimComponent):
                 application_instance.configure(server_ip_address=IPv4Address(ip_address))
             else:
                 pass
-
+        application_instance.install()
         if application_instance.name in self.software_manager.software:
             return True
         else:

src/primaite/simulator/network/hardware/nodes/host/computer.py

@@ -1,4 +1,7 @@
+from typing import ClassVar, Dict
+
 from primaite.simulator.network.hardware.nodes.host.host_node import HostNode
+from primaite.simulator.system.services.ftp.ftp_client import FTPClient
 
 
 class Computer(HostNode):
@@ -29,4 +32,6 @@ class Computer(HostNode):
         * Web Browser
     """
 
+    SYSTEM_SOFTWARE: ClassVar[Dict] = {**HostNode.SYSTEM_SOFTWARE, "FTPClient": FTPClient}
+
     pass

src/primaite/simulator/network/hardware/nodes/host/host_node.py

@@ -10,7 +10,6 @@ from primaite.simulator.network.transmission.data_link_layer import Frame
 from primaite.simulator.system.applications.web_browser import WebBrowser
 from primaite.simulator.system.services.arp.arp import ARP, ARPPacket
 from primaite.simulator.system.services.dns.dns_client import DNSClient
-from primaite.simulator.system.services.ftp.ftp_client import FTPClient
 from primaite.simulator.system.services.icmp.icmp import ICMP
 from primaite.simulator.system.services.ntp.ntp_client import NTPClient
 from primaite.utils.validators import IPV4Address
@@ -301,7 +300,6 @@ class HostNode(Node):
         "HostARP": HostARP,
         "ICMP": ICMP,
         "DNSClient": DNSClient,
-        "FTPClient": FTPClient,
         "NTPClient": NTPClient,
         "WebBrowser": WebBrowser,
     }