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

Revert "Make the Ethernet side the source in uBridge connection and UDP tunnel the destination. Ref #771."

Browse Source 
This reverts commit 31c04cc95b.
This commit is contained in:
grossmj 2016-11-23 21:55:26 +11:00
parent 875051d05e
commit 7754d7f211
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/compute/builtin/nodes/cloud.py
View File

@ -180,6 +180,10 @@ class Cloud(BaseNode):
yield from self._ubridge_send("bridge create {name}".format(name=bridge_name)) yield from self._ubridge_send("bridge create {name}".format(name=bridge_name))
if not isinstance(nio, NIOUDP): if not isinstance(nio, NIOUDP):
raise NodeError("Source NIO is not UDP") raise NodeError("Source NIO is not UDP")
yield from self._ubridge_send('bridge add_nio_udp {name} {lport} {rhost} {rport}'.format(name=bridge_name,
lport=nio.lport,
rhost=nio.rhost,
rport=nio.rport))
if port_info["type"] in ("ethernet", "tap"): if port_info["type"] in ("ethernet", "tap"):
@ -209,11 +213,6 @@ class Cloud(BaseNode):
rhost=port_info["rhost"], rhost=port_info["rhost"],
rport=port_info["rport"])) rport=port_info["rport"]))
yield from self._ubridge_send('bridge add_nio_udp {name} {lport} {rhost} {rport}'.format(name=bridge_name,
lport=nio.lport,
rhost=nio.rhost,
rport=nio.rport))
if nio.capturing: if nio.capturing:
yield from self._ubridge_send('bridge start_capture {name} "{pcap_file}"'.format(name=bridge_name, yield from self._ubridge_send('bridge start_capture {name} "{pcap_file}"'.format(name=bridge_name,
pcap_file=nio.pcap_output_file)) pcap_file=nio.pcap_output_file))