#2248 - TSome further fixess to ARP. Also refactored PCAP to log inbound and outbound frames separately

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

@@ -35,16 +35,17 @@ class PacketCapture:
         self.switch_port_number = switch_port_number
         "The SwitchPort number."
 
+        self.inbound_logger = None
+        self.outbound_logger = None
+
         self.current_episode: int = 1
 
-        self.setup_logger()
+        self.setup_logger(outbound=False)
+        self.setup_logger(outbound=True)
 
-    def setup_logger(self):
+    def setup_logger(self, outbound: bool = False):
         """Set up the logger configuration."""
-        if not SIM_OUTPUT.save_pcap_logs:
-            return
-
-        log_path = self._get_log_path()
+        log_path = self._get_log_path(outbound)
 
         file_handler = logging.FileHandler(filename=log_path)
         file_handler.setLevel(60)  # Custom log level > CRITICAL to prevent any unwanted standard DEBUG-CRITICAL logs
@@ -52,11 +53,17 @@ class PacketCapture:
         log_format = "%(message)s"
         file_handler.setFormatter(logging.Formatter(log_format))
 
-        self.logger = logging.getLogger(self._logger_name)
-        self.logger.setLevel(60)  # Custom log level > CRITICAL to prevent any unwanted standard DEBUG-CRITICAL logs
-        self.logger.addHandler(file_handler)
+        if outbound:
+            self.outbound_logger = logging.getLogger(self._get_logger_name(outbound))
+            logger = self.outbound_logger
+        else:
+            self.inbound_logger = logging.getLogger(self._get_logger_name(outbound))
+            logger = self.inbound_logger
 
-        self.logger.addFilter(_JSONFilter())
+        logger.setLevel(60)  # Custom log level > CRITICAL to prevent any unwanted standard DEBUG-CRITICAL logs
+        logger.addHandler(file_handler)
+
+        logger.addFilter(_JSONFilter())
 
     def read(self) -> List[Dict[str, Any]]:
         """
@@ -70,27 +77,35 @@ class PacketCapture:
                 frames.append(json.loads(line.rstrip()))
         return frames
 
-    @property
-    def _logger_name(self) -> str:
+    def _get_logger_name(self, outbound: bool = False) -> str:
         """Get PCAP the logger name."""
         if self.ip_address:
-            return f"{self.hostname}_{self.ip_address}_pcap"
+            return f"{self.hostname}_{self.ip_address}_{'outbound' if outbound else 'inbound'}_pcap"
         if self.switch_port_number:
-            return f"{self.hostname}_port-{self.switch_port_number}_pcap"
-        return f"{self.hostname}_pcap"
+            return f"{self.hostname}_port-{self.switch_port_number}_{'outbound' if outbound else 'inbound'}_pcap"
+        return f"{self.hostname}_{'outbound' if outbound else 'inbound'}_pcap"
 
-    def _get_log_path(self) -> Path:
+    def _get_log_path(self, outbound: bool = False) -> Path:
         """Get the path for the log file."""
         root = SIM_OUTPUT.path / f"episode_{self.current_episode}" / self.hostname
         root.mkdir(exist_ok=True, parents=True)
-        return root / f"{self._logger_name}.log"
+        return root / f"{self._get_logger_name(outbound)}.log"
 
-    def capture(self, frame):  # noqa - I'll have a circular import and cant use if TYPE_CHECKING ;(
+    def capture_inbound(self, frame):  # noqa - I'll have a circular import and cant use if TYPE_CHECKING ;(
         """
-        Capture a Frame and log it.
+        Capture an inbound Frame and log it.
 
         :param frame: The PCAP frame to capture.
         """
-        if SIM_OUTPUT.save_pcap_logs:
-            msg = frame.model_dump_json()
-            self.logger.log(level=60, msg=msg)  # Log at custom log level > CRITICAL
+        msg = frame.model_dump_json()
+        self.inbound_logger.log(level=60, msg=msg)  # Log at custom log level > CRITICAL
+
+    def capture_outbound(self, frame):  # noqa - I'll have a circular import and cant use if TYPE_CHECKING ;(
+        """
+        Capture an inbound Frame and log it.
+
+        :param frame: The PCAP frame to capture.
+        """
+        msg = frame.model_dump_json()
+        self.outbound_logger.log(level=60, msg=msg)  # Log at custom log level > CRITICAL
+

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

@@ -221,7 +221,7 @@ class SessionManager:
             if payload.request:
                 dst_mac_address = "ff:ff:ff:ff:ff:ff"
             else:
-                dst_mac_address = payload.sender_mac_addr
+                dst_mac_address = payload.target_mac_addr
             outbound_nic = self.resolve_outbound_nic(payload.target_ip_address)
             is_broadcast = payload.request
             ip_protocol = IPProtocol.UDP