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

Fix minor issues in actions

Browse Source
This commit is contained in:
Marek Wolan
2024-01-08 13:28:34 +00:00
parent 2f97dcb6f9
commit 27f70204ed
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/primaite/game/agent/actions.py
View File

@@ -89,7 +89,7 @@ class NodeServiceAbstractAction(AbstractAction):
service_name = self.manager.get_service_name_by_idx(node_id, service_id) service_name = self.manager.get_service_name_by_idx(node_id, service_id)
if node_name is None or service_name is None: if node_name is None or service_name is None:
return ["do_nothing"] return ["do_nothing"]
return ["network", "node", node_name, "services", service_name, self.verb] return ["network", "node", node_name, "service", service_name, self.verb]
class NodeServiceScanAction(NodeServiceAbstractAction): class NodeServiceScanAction(NodeServiceAbstractAction):
@@ -460,13 +460,13 @@ class NetworkACLAddRuleAction(AbstractAction):
dst_ip = "ALL" dst_ip = "ALL"
return ["do_nothing"] # NOT SUPPORTED, JUST DO NOTHING IF WE COME ACROSS THIS return ["do_nothing"] # NOT SUPPORTED, JUST DO NOTHING IF WE COME ACROSS THIS
else: else:
dst_ip = self.manager.get_ip_address_by_idx(dest_ip_id) dst_ip = self.manager.get_ip_address_by_idx(dest_ip_id - 2)
# subtract 2 to account for UNUSED=0, and ALL=1 # subtract 2 to account for UNUSED=0, and ALL=1
if dest_port_id == 1: if dest_port_id == 1:
dst_port = "ALL" dst_port = "ALL"
else: else:
dst_port = self.manager.get_port_by_idx(dest_port_id) dst_port = self.manager.get_port_by_idx(dest_port_id - 2)
# subtract 2 to account for UNUSED=0, and ALL=1 # subtract 2 to account for UNUSED=0, and ALL=1
return [ return [