#2248 - Initial work has been done on moving ICMP into services. still tidying up to be done. Need to fix tests too.

src/primaite/simulator/system/core/session_manager.py

@@ -293,8 +293,15 @@ class SessionManager:
             dst_port = frame.tcp.dst_port
         elif frame.udp:
             dst_port = frame.udp.dst_port
+        elif frame.icmp:
+            dst_port = Port.NONE
         self.software_manager.receive_payload_from_session_manager(
-            payload=frame.payload, port=dst_port, protocol=frame.ip.protocol, session_id=session.uuid, from_nic=from_nic
+            payload=frame.payload,
+            port=dst_port,
+            protocol=frame.ip.protocol,
+            session_id=session.uuid,
+            from_nic=from_nic,
+            frame=frame
         )
 
     def show(self, markdown: bool = False):

src/primaite/simulator/system/core/software_manager.py

@@ -4,6 +4,7 @@ from typing import Any, Dict, List, Optional, Tuple, TYPE_CHECKING, Union
 from prettytable import MARKDOWN, PrettyTable
 
 from primaite.simulator.file_system.file_system import FileSystem
+from primaite.simulator.network.transmission.data_link_layer import Frame
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.applications.application import Application, ApplicationOperatingState
@@ -16,6 +17,7 @@ if TYPE_CHECKING:
     from primaite.simulator.system.core.sys_log import SysLog
     from primaite.simulator.network.hardware.base import Node, NIC
     from primaite.simulator.system.services.arp.arp import ARP
+    from primaite.simulator.system.services.icmp.icmp import ICMP
 
 from typing import Type, TypeVar
 
@@ -51,6 +53,10 @@ class SoftwareManager:
     def arp(self) -> 'ARP':
         return self.software.get("ARP")  # noqa
 
+    @property
+    def icmp(self) -> 'ICMP':
+        return self.software.get("ICMP")  # noqa
+
     def get_open_ports(self) -> List[Port]:
         """
         Get a list of open ports.
@@ -160,7 +166,7 @@ class SoftwareManager:
         )
 
     def receive_payload_from_session_manager(
-        self, payload: Any, port: Port, protocol: IPProtocol, session_id: str, from_nic: "NIC"
+        self, payload: Any, port: Port, protocol: IPProtocol, session_id: str, from_nic: "NIC", frame: Frame
     ):
         """
         Receive a payload from the SessionManager and forward it to the corresponding service or application.
@@ -170,7 +176,7 @@ class SoftwareManager:
         """
         receiver: Optional[Union[Service, Application]] = self.port_protocol_mapping.get((port, protocol), None)
         if receiver:
-            receiver.receive(payload=payload, session_id=session_id, from_nic=from_nic)
+            receiver.receive(payload=payload, session_id=session_id, from_nic=from_nic, frame=frame)
         else:
             self.sys_log.error(f"No service or application found for port {port} and protocol {protocol}")
         pass
@@ -181,7 +187,7 @@ class SoftwareManager:
 
         :param markdown: If True, outputs the table in markdown format. Default is False.
         """
-        table = PrettyTable(["Name", "Type", "Operating State", "Health State", "Port"])
+        table = PrettyTable(["Name", "Type", "Operating State", "Health State", "Port", "Protocol"])
         if markdown:
             table.set_style(MARKDOWN)
         table.align = "l"
@@ -194,7 +200,8 @@ class SoftwareManager:
                     software_type,
                     software.operating_state.name,
                     software.health_state_actual.name,
-                    software.port.value,
+                    software.port.value if software.port != Port.NONE else None,
+                    software.protocol.value
                 ]
             )
         print(table)

src/primaite/simulator/system/core/sys_log.py

@@ -88,47 +88,62 @@ class SysLog:
         root.mkdir(exist_ok=True, parents=True)
         return root / f"{self.hostname}_sys.log"
 
-    def debug(self, msg: str):
+    def debug(self, msg: str, to_terminal: bool = False):
         """
         Logs a message with the DEBUG level.
 
         :param msg: The message to be logged.
+        :param to_terminal: If True, prints to the terminal too.
         """
         if SIM_OUTPUT.save_sys_logs:
             self.logger.debug(msg)
+        if to_terminal:
+            print(msg)
 
-    def info(self, msg: str):
+    def info(self, msg: str, to_terminal: bool = False):
         """
         Logs a message with the INFO level.
 
         :param msg: The message to be logged.
+        :param to_terminal: If True, prints to the terminal too.
         """
         if SIM_OUTPUT.save_sys_logs:
             self.logger.info(msg)
+        if to_terminal:
+            print(msg)
 
-    def warning(self, msg: str):
+    def warning(self, msg: str, to_terminal: bool = False):
         """
         Logs a message with the WARNING level.
 
         :param msg: The message to be logged.
+        :param to_terminal: If True, prints to the terminal too.
         """
         if SIM_OUTPUT.save_sys_logs:
             self.logger.warning(msg)
+        if to_terminal:
+            print(msg)
 
-    def error(self, msg: str):
+    def error(self, msg: str, to_terminal: bool = False):
         """
         Logs a message with the ERROR level.
 
         :param msg: The message to be logged.
+        :param to_terminal: If True, prints to the terminal too.
         """
         if SIM_OUTPUT.save_sys_logs:
             self.logger.error(msg)
+        if to_terminal:
+            print(msg)
 
-    def critical(self, msg: str):
+    def critical(self, msg: str, to_terminal: bool = False):
         """
         Logs a message with the CRITICAL level.
 
         :param msg: The message to be logged.
+        :param to_terminal: If True, prints to the terminal too.
         """
         if SIM_OUTPUT.save_sys_logs:
             self.logger.critical(msg)
+        if to_terminal:
+            print(msg)