#1752: simplifying the DNS implementation - switch to TCP + fixing the DNS integration test

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

@@ -406,7 +406,8 @@ class SwitchPort(SimComponent):
         if self.enabled:
             frame.decrement_ttl()
             self.pcap.capture(frame)
-            self.connected_node.forward_frame(frame=frame, incoming_port=self)
+            connected_node: Node = self.connected_node
+            connected_node.forward_frame(frame=frame, incoming_port=self)
             return True
         return False
 

src/primaite/simulator/network/networks.py

@@ -132,6 +132,8 @@ def arcd_uc2_network() -> Network:
     )
     client_1.power_on()
     client_1.software_manager.install(DNSClient)
+    client_1_dns_client_service: DNSServer = client_1.software_manager.software["DNSClient"]  # noqa
+    client_1_dns_client_service.start()
     network.connect(endpoint_b=client_1.ethernet_port[1], endpoint_a=switch_2.switch_ports[1])
     client_1.software_manager.install(DataManipulationBot)
     db_manipulation_bot: DataManipulationBot = client_1.software_manager.software["DataManipulationBot"]
@@ -143,6 +145,8 @@ def arcd_uc2_network() -> Network:
     )
     client_2.power_on()
     client_2.software_manager.install(DNSClient)
+    client_2_dns_client_service: DNSServer = client_2.software_manager.software["DNSClient"]  # noqa
+    client_2_dns_client_service.start()
     network.connect(endpoint_b=client_2.ethernet_port[1], endpoint_a=switch_2.switch_ports[2])
 
     # Domain Controller
@@ -215,6 +219,7 @@ def arcd_uc2_network() -> Network:
 
     # register the web_server to a domain
     dns_server_service: DNSServer = domain_controller.software_manager.software["DNSServer"]  # noqa
+    dns_server_service.start()
     dns_server_service.dns_register("arcd.com", web_server.ip_address)
 
     # Backup Server

src/primaite/simulator/network/transmission/data_link_layer.py

@@ -5,7 +5,6 @@ from pydantic import BaseModel
 
 from primaite import getLogger
 from primaite.simulator.network.protocols.arp import ARPPacket
-from primaite.simulator.network.protocols.dns import DNSPacket
 from primaite.simulator.network.transmission.network_layer import ICMPPacket, IPPacket, IPProtocol
 from primaite.simulator.network.transmission.primaite_layer import PrimaiteHeader
 from primaite.simulator.network.transmission.transport_layer import TCPHeader, UDPHeader
@@ -97,8 +96,6 @@ class Frame(BaseModel):
     "ICMP header."
     arp: Optional[ARPPacket] = None
     "ARP packet."
-    dns: Optional[DNSPacket] = None
-    "DNS packet."
     primaite: PrimaiteHeader
     "PrimAITE header."
     payload: Optional[Any] = None