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

Temporary fix for tunnel binding for Daniel from SWI

Browse Source
This commit is contained in:
Julien Duponchelle 2016-12-13 16:46:09 +01:00
parent a3495304ad
commit 668c479ef6
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gns3server/controller/compute.py
View File

@ -594,6 +594,10 @@ class Compute:
if other_compute == self: if other_compute == self:
return (self.host_ip, self.host_ip) return (self.host_ip, self.host_ip)
# Perhaps the user has correct network gateway, we trust him
if (self.host_ip not in ('0.0.0.0', '127.0.0.1') and other_compute.host_ip not in ('0.0.0.0', '127.0.0.1')):
return (self.host_ip, other_compute.host_ip)
this_compute_interfaces = yield from self.interfaces() this_compute_interfaces = yield from self.interfaces()
other_compute_interfaces = yield from other_compute.interfaces() other_compute_interfaces = yield from other_compute.interfaces()
@ -624,7 +628,4 @@ class Compute:
if this_network.overlaps(other_network): if this_network.overlaps(other_network):
return (this_interface["ip_address"], other_interface["ip_address"]) return (this_interface["ip_address"], other_interface["ip_address"])
# Perhaps the user has correct network gateway
if (self.host_ip not in ('0.0.0.0', '127.0.0.1') and other_compute.host_ip not in ('0.0.0.0', '127.0.0.1')):
return (self.host_ip, other_compute.host_ip)
raise ValueError("No common subnet for compute {} and {}".format(self.name, other_compute.name)) raise ValueError("No common subnet for compute {} and {}".format(self.name, other_compute.name))