ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-21 00:22:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 2.2

Browse Source
This commit is contained in:
grossmj
2023-01-05 12:38:00 +08:00
parent f837912ebc f8f5d7ec07
commit 27d9063e56
21 changed files with 301 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/compute/dynamips/hypervisor.py
View File

@ -197,11 +197,9 @@ class Hypervisor(DynamipsHypervisor):
command = [self._path]
command.extend(["-N1"]) # use instance IDs for filenames
command.extend(["-l", f"dynamips_i{self._id}_log.txt"]) # log file
# Dynamips cannot listen for hypervisor commands and for console connections on
# 2 different IP addresses.
# See https://github.com/GNS3/dynamips/issues/62
if self._console_host != "0.0.0.0" and self._console_host != "::":
command.extend(["-H", f"{self._host}:{self._port}"])
if not sys.platform.startswith("win"):
command.extend(["-H", f"{self._host}:{self._port}", "--console-binding-addr", self._console_host])
else:
command.extend(["-H", str(self._port)])
return command