diff --git a/AIDojoCoordinator/coordinator.py b/AIDojoCoordinator/coordinator.py index a554b9ab..504059c3 100644 --- a/AIDojoCoordinator/coordinator.py +++ b/AIDojoCoordinator/coordinator.py @@ -378,6 +378,7 @@ async def start_tasks(self): else: self._global_defender = None self._use_dynamic_ips = self.task_config.get_use_dynamic_addresses() + self.logger.info(f"Change IP every episode set to: {self._use_dynamic_ips}") self._rewards = self.task_config.get_rewards(["step", "success", "fail", "false_positive"]) self.logger.info(f"Rewards set to:{self._rewards}") self._min_required_players = self.task_config.get_required_num_players() diff --git a/AIDojoCoordinator/worlds/NSEGameCoordinator.py b/AIDojoCoordinator/worlds/NSEGameCoordinator.py index def4e401..3410b116 100644 --- a/AIDojoCoordinator/worlds/NSEGameCoordinator.py +++ b/AIDojoCoordinator/worlds/NSEGameCoordinator.py @@ -307,7 +307,6 @@ def _create_new_network_mapping(self)->tuple: fake = self._faker_object mapping_nets = {} mapping_ips = {} - # generate mapping for networks private_nets = [] for net in self._networks.keys(): @@ -369,13 +368,14 @@ def _create_new_network_mapping(self)->tuple: new_self_networks[mapping_nets[net]].add(mapping_ips[ip]) self._networks = new_self_networks - #self._firewall - new_self_firewall = {} - for ip, dst_ips in self._firewall.items(): - new_self_firewall[mapping_ips[ip]] = set() + #self._firewall_original (we do not care about the changes done during the episode) + new_self_firewall_original = {} + for ip, dst_ips in self._firewall_original.items(): + new_self_firewall_original[mapping_ips[ip]] = set() for dst_ip in dst_ips: - new_self_firewall[mapping_ips[ip]].add(mapping_ips[dst_ip]) - self._firewall = new_self_firewall + new_self_firewall_original[mapping_ips[ip]].add(mapping_ips[dst_ip]) + self.logger.debug(f"New FW: {new_self_firewall_original}") + self._firewall_original = new_self_firewall_original #self._ip_to_hostname new_self_ip_to_hostname = {}