#2248 - Further fixes. All router integration tests now passing.

src/primaite/simulator/system/services/ntp/ntp_client.py

@@ -108,9 +108,13 @@ class NTPClient(Service):
 
     def request_time(self) -> None:
         """Send request to ntp_server."""
-        ntp_server_packet = NTPPacket()
-
-        self.send(payload=ntp_server_packet, dest_ip_address=self.ntp_server)
+        self.software_manager.session_manager.receive_payload_from_software_manager(
+            payload=NTPPacket(),
+            dst_ip_address=self.ntp_server,
+            src_port=self.port,
+            dst_port=self.port,
+            ip_protocol=self.protocol,
+        )
 
     def apply_timestep(self, timestep: int) -> None:
         """

src/primaite/simulator/system/services/ntp/ntp_server.py

@@ -69,5 +69,11 @@ class NTPServer(Service):
         time = datetime.now()
         payload = payload.generate_reply(time)
         # send reply
-        self.send(payload, session_id)
+        self.software_manager.session_manager.receive_payload_from_software_manager(
+            payload=payload,
+            src_port=self.port,
+            dst_port=self.port,
+            ip_protocol=self.protocol,
+            session_id=session_id
+        )
         return True