arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Require Dynamips 0.2.23 and bind Dynamips hypervisor on 127.0.0.1

Browse Source
This commit is contained in:
grossmj 2023-01-02 15:26:59 +08:00
parent 04ba3b6549
commit 771a9a5ddb
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gns3server/compute/dynamips/__init__.py
View File

@ -278,10 +278,14 @@ class Dynamips(BaseManager):
if not working_dir: if not working_dir:
working_dir = tempfile.gettempdir() working_dir = tempfile.gettempdir()
# FIXME: hypervisor should always listen to 127.0.0.1 if not sys.platform.startswith("win"):
# See https://github.com/GNS3/dynamips/issues/62 # Hypervisor should always listen to 127.0.0.1
server_config = self.config.get_section_config("Server") # See https://github.com/GNS3/dynamips/issues/62
server_host = server_config.get("host") # This was fixed in Dynamips v0.2.23 which hasn't been built for Windows
server_host = "127.0.0.1"
else:
server_config = self.config.get_section_config("Server")
server_host = server_config.get("host")
try: try:
info = socket.getaddrinfo(server_host, 0, socket.AF_UNSPEC, socket.SOCK_STREAM, 0, socket.AI_PASSIVE) info = socket.getaddrinfo(server_host, 0, socket.AF_UNSPEC, socket.SOCK_STREAM, 0, socket.AI_PASSIVE)
@ -306,6 +310,8 @@ class Dynamips(BaseManager):
await hypervisor.connect() await hypervisor.connect()
if parse_version(hypervisor.version) < parse_version('0.2.11'): if parse_version(hypervisor.version) < parse_version('0.2.11'):
raise DynamipsError("Dynamips version must be >= 0.2.11, detected version is {}".format(hypervisor.version)) raise DynamipsError("Dynamips version must be >= 0.2.11, detected version is {}".format(hypervisor.version))
if not sys.platform.startswith("win") and parse_version(hypervisor.version) < parse_version('0.2.23'):
raise DynamipsError("Dynamips version must be >= 0.2.23 on Linux/macOS, detected version is {}".format(hypervisor.version))
return hypervisor return hypervisor

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

@ -24,6 +24,7 @@ import os
import subprocess import subprocess
import asyncio import asyncio
from gns3server.utils import parse_version
from gns3server.utils.asyncio import wait_for_process_termination from gns3server.utils.asyncio import wait_for_process_termination
from .dynamips_hypervisor import DynamipsHypervisor from .dynamips_hypervisor import DynamipsHypervisor
from .dynamips_error import DynamipsError from .dynamips_error import DynamipsError
@ -204,11 +205,9 @@ class Hypervisor(DynamipsHypervisor):
command = [self._path] command = [self._path]
command.extend(["-N1"]) # use instance IDs for filenames command.extend(["-N1"]) # use instance IDs for filenames
command.extend(["-l", "dynamips_i{}_log.txt".format(self._id)]) # log file command.extend(["-l", "dynamips_i{}_log.txt".format(self._id)]) # log file
# Dynamips cannot listen for hypervisor commands and for console connections on if parse_version(self.version) >= parse_version('0.2.23'):
# 2 different IP addresses. command.extend(["-H", "{}:{}".format(self._host, self._port), "--console-binding-addr", self._console_host])
# See https://github.com/GNS3/dynamips/issues/62
if self._console_host != "0.0.0.0" and self._console_host != "::":
command.extend(["-H", "{}:{}".format(self._host, self._port)])
else: else:
command.extend(["-H", str(self._port)]) command.extend(["-H", str(self._port)])
return command return command

7
gns3server/compute/port_manager.py
View File

@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import socket import socket
import ipaddress
from aiohttp.web import HTTPConflict from aiohttp.web import HTTPConflict
from gns3server.config import Config from gns3server.config import Config
@ -91,6 +92,12 @@ class PortManager:
if remote_console_connections: if remote_console_connections:
log.warning("Remote console connections are allowed") log.warning("Remote console connections are allowed")
self._console_host = "0.0.0.0" self._console_host = "0.0.0.0"
try:
ip = ipaddress.ip_address(new_host)
if isinstance(ip, ipaddress.IPv6Address):
self._console_host = "::"
except ValueError:
log.warning("Could not determine IP address type for console host")
else: else:
self._console_host = new_host self._console_host = new_host