NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-02-14 20:23:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix VMware add ubridge connection. Fixes #2490

Browse Source
This commit is contained in:
grossmj 2025-01-27 12:12:43 +10:00
parent cfc4bb371a
commit 4fd41991db
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/compute/vmware/vmware_vm.py
View File

@ -352,6 +352,7 @@ class VMwareVM(BaseNode):
vnet = self._get_vnet(adapter_number) vnet = self._get_vnet(adapter_number)
await self._ubridge_send(f"bridge create {vnet}") await self._ubridge_send(f"bridge create {vnet}")
vmnet_interface = os.path.basename(self._vmx_pairs[vnet]) vmnet_interface = os.path.basename(self._vmx_pairs[vnet])
block_host_traffic = self.manager.config.settings.VMware.block_host_traffic
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):
if parse_version(platform.mac_ver()[0]) >= parse_version("11.0.0"): if parse_version(platform.mac_ver()[0]) >= parse_version("11.0.0"):
@ -360,13 +361,11 @@ class VMwareVM(BaseNode):
vmnet_interface = self.manager.find_bridge_interface(vmnet_interface) vmnet_interface = self.manager.find_bridge_interface(vmnet_interface)
if not vmnet_interface: if not vmnet_interface:
raise VMwareError(f"Could not find bridge interface linked with {vmnet_interface}") raise VMwareError(f"Could not find bridge interface linked with {vmnet_interface}")
block_host_traffic = self.manager.config.get_section_config("VMware").getboolean("block_host_traffic", False)
await self._add_ubridge_ethernet_connection(vnet, vmnet_interface, block_host_traffic) await self._add_ubridge_ethernet_connection(vnet, vmnet_interface, block_host_traffic)
else: else:
# special case on macOS, we cannot bind VMnet interfaces using the libpcap # special case on macOS, we cannot bind VMnet interfaces using the libpcap
await self._ubridge_send('bridge add_nio_fusion_vmnet {name} "{interface}"'.format(name=vnet, interface=vmnet_interface)) await self._ubridge_send('bridge add_nio_fusion_vmnet {name} "{interface}"'.format(name=vnet, interface=vmnet_interface))
else: else:
block_host_traffic = self.manager.config.VMware.block_host_traffic
await self._add_ubridge_ethernet_connection(vnet, vmnet_interface, block_host_traffic) await self._add_ubridge_ethernet_connection(vnet, vmnet_interface, block_host_traffic)
if isinstance(nio, NIOUDP): if isinstance(nio, NIOUDP):