oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#2775 - Updated to look neater

Browse Source
This commit is contained in:
Charlie Crane
2024-09-11 10:12:07 +01:00
parent 1c6e8b2a95
commit 19d6fa2174
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/primaite/simulator/network/hardware/nodes/network/router.py
View File

@@ -468,13 +468,6 @@ class AccessControlList(SimComponent):
permitted = False permitted = False
rule: ACLRule = None rule: ACLRule = None
# check if the frame is ARP and if ACL rules apply.
if frame.udp:
if frame.is_arp:
permitted = True
rule: ACLRule = None
return permitted, rule
for _rule in self._acl: for _rule in self._acl:
if not _rule: if not _rule:
continue continue
@@ -1376,6 +1369,12 @@ class Router(NetworkNode):
return False return False
def subject_to_acl(self, frame: Frame) -> bool:
"""Check that frame is subject to ACL rules."""
if frame.ip.protocol == IPProtocol.UDP and frame.udp.dst_port == Port.ARP:
return False
return True
def receive_frame(self, frame: Frame, from_network_interface: RouterInterface): def receive_frame(self, frame: Frame, from_network_interface: RouterInterface):
""" """
Processes an incoming frame received on one of the router's interfaces. Processes an incoming frame received on one of the router's interfaces.
@@ -1389,8 +1388,12 @@ class Router(NetworkNode):
if self.operating_state != NodeOperatingState.ON: if self.operating_state != NodeOperatingState.ON:
return return
if self.subject_to_acl(frame=frame):
# Check if it's permitted # Check if it's permitted
permitted, rule = self.acl.is_permitted(frame) permitted, rule = self.acl.is_permitted(frame)
else:
permitted = True
rule = None
if not permitted: if not permitted:
at_port = self._get_port_of_nic(from_network_interface) at_port = self._get_port_of_nic(from_network_interface)