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

Find Dynamips version before hypervisor launch and do not require Dynamips v0.2.23

Browse Source
This commit is contained in:
grossmj
2023-01-16 18:04:46 +08:00
parent 5a3b502024
commit c57b0cbb53
3 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ class Hypervisor(DynamipsHypervisor):
_instance_count = 1
def __init__(self, path, working_dir, host, port, console_host):
def __init__(self, path, working_dir, host, port, console_host, bind_console_host=False):
super().__init__(working_dir, host, port)
@ -55,6 +55,7 @@ class Hypervisor(DynamipsHypervisor):
Hypervisor._instance_count += 1
self._console_host = console_host
self._bind_console_host = bind_console_host
self._path = path
self._command = []
self._process = None
@ -204,8 +205,12 @@ class Hypervisor(DynamipsHypervisor):
command = [self._path]
command.extend(["-N1"]) # use instance IDs for filenames
command.extend(["-l", "dynamips_i{}_log.txt".format(self._id)]) # log file
if not sys.platform.startswith("win"):
if self._bind_console_host:
# support was added in Dynamips version 0.2.23
command.extend(["-H", "{}:{}".format(self._host, self._port), "--console-binding-addr", self._console_host])
elif self._console_host != "0.0.0.0" and self._console_host != "::":
command.extend(["-H", "{}:{}".format(self._host, self._port)])
else:
command.extend(["-H", str(self._port)])