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

Use the correct UDP tunnel Qemu syntax for version > 1.1.0 when legacy networking is enabled.

Browse Source
This commit is contained in:
grossmj 2015-10-04 06:41:39 -06:00
parent 80d99ec395
commit 970f22a83e
2 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gns3server/modules/qemu/__init__.py
View File

@ -86,7 +86,7 @@ class Qemu(BaseManager):
os.access(os.path.join(path, f), os.X_OK) and \ os.access(os.path.join(path, f), os.X_OK) and \
os.path.isfile(os.path.join(path, f)): os.path.isfile(os.path.join(path, f)):
qemu_path = os.path.join(path, f) qemu_path = os.path.join(path, f)
version = yield from Qemu._get_qemu_version(qemu_path) version = yield from Qemu.get_qemu_version(qemu_path)
qemus.append({"path": qemu_path, "version": version}) qemus.append({"path": qemu_path, "version": version})
except OSError: except OSError:
continue continue
@ -95,7 +95,7 @@ class Qemu(BaseManager):
@staticmethod @staticmethod
@asyncio.coroutine @asyncio.coroutine
def _get_qemu_version(qemu_path): def get_qemu_version(qemu_path):
""" """
Gets the Qemu version. Gets the Qemu version.
@ -103,17 +103,30 @@ class Qemu(BaseManager):
""" """
if sys.platform.startswith("win"): if sys.platform.startswith("win"):
# Qemu on Windows doesn't return anything with parameter -version
# look for a version number in version.txt file in the same directory instead
version_file = os.path.join(os.path.dirname(qemu_path), "version.txt")
if os.path.isfile(version_file):
try:
with open(version_file, "rb") as file:
version = file.read().decode("utf-8").strip()
match = re.search("[0-9\.]+", version)
if match:
return version
except (UnicodeDecodeError, OSError) as e:
log.warn("could not read {}: {}".format(version_file, e))
return "" return ""
try: else:
output = yield from subprocess_check_output(qemu_path, "-version") try:
match = re.search("version\s+([0-9a-z\-\.]+)", output) output = yield from subprocess_check_output(qemu_path, "-version")
if match: match = re.search("version\s+([0-9a-z\-\.]+)", output)
version = match.group(1) if match:
return version version = match.group(1)
else: return version
raise QemuError("Could not determine the Qemu version for {}".format(qemu_path)) else:
except subprocess.SubprocessError as e: raise QemuError("Could not determine the Qemu version for {}".format(qemu_path))
raise QemuError("Error while looking for the Qemu version: {}".format(e)) except subprocess.SubprocessError as e:
raise QemuError("Error while looking for the Qemu version: {}".format(e))
@staticmethod @staticmethod
def get_legacy_vm_workdir(legacy_vm_id, name): def get_legacy_vm_workdir(legacy_vm_id, name):

29
gns3server/modules/qemu/qemu_vm.py
View File

@ -28,6 +28,7 @@ import shlex
import asyncio import asyncio
import socket import socket
from pkg_resources import parse_version
from .qemu_error import QemuError from .qemu_error import QemuError
from ..adapters.ethernet_adapter import EthernetAdapter from ..adapters.ethernet_adapter import EthernetAdapter
from ..nios.nio_udp import NIOUDP from ..nios.nio_udp import NIOUDP
@ -990,6 +991,14 @@ class QemuVM(BaseVM):
network_options = [] network_options = []
network_options.extend(["-net", "none"]) # we do not want any user networking back-end if no adapter is connected. network_options.extend(["-net", "none"]) # we do not want any user networking back-end if no adapter is connected.
patched_qemu = False
if self._legacy_networking:
version = yield from self.manager.get_qemu_version(self.qemu_path)
if version and parse_version(version) < parse_version("1.1.0"):
# this is a patched Qemu if version is below 1.1.0
patched_qemu = True
for adapter_number, adapter in enumerate(self._ethernet_adapters): for adapter_number, adapter in enumerate(self._ethernet_adapters):
# TODO: let users specify a base mac address # TODO: let users specify a base mac address
mac = "00:00:ab:%s:%s:%02x" % (self.id[-4:-2], self.id[-2:], adapter_number) mac = "00:00:ab:%s:%s:%02x" % (self.id[-4:-2], self.id[-2:], adapter_number)
@ -999,11 +1008,21 @@ class QemuVM(BaseVM):
if nio: if nio:
network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_number, mac, self._adapter_type)]) network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_number, mac, self._adapter_type)])
if isinstance(nio, NIOUDP): if isinstance(nio, NIOUDP):
network_options.extend(["-net", "udp,vlan={},name=gns3-{},sport={},dport={},daddr={}".format(adapter_number, if patched_qemu:
adapter_number, # use patched Qemu syntax
nio.lport, network_options.extend(["-net", "udp,vlan={},name=gns3-{},sport={},dport={},daddr={}".format(adapter_number,
nio.rport, adapter_number,
nio.rhost)]) nio.lport,
nio.rport,
nio.rhost)])
else:
# use UDP tunnel support added in Qemu 1.1.0
network_options.extend(["-net", "socket,vlan={},name=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_number,
adapter_number,
nio.rhost,
nio.rport,
self._host,
nio.lport)])
elif isinstance(nio, NIOTAP): elif isinstance(nio, NIOTAP):
network_options.extend(["-net", "tap,name=gns3-{},ifname={}".format(adapter_number, nio.tap_device)]) network_options.extend(["-net", "tap,name=gns3-{},ifname={}".format(adapter_number, nio.tap_device)])
elif isinstance(nio, NIONAT): elif isinstance(nio, NIONAT):