From 7754d7f2111f098a316a5d4fb59b46f746f2c4d8 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 23 Nov 2016 21:55:26 +1100 Subject: [PATCH] Revert "Make the Ethernet side the source in uBridge connection and UDP tunnel the destination. Ref #771." This reverts commit 31c04cc95bd1ea28ea450aa27eecbcc5d27d01ee. --- gns3server/compute/builtin/nodes/cloud.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gns3server/compute/builtin/nodes/cloud.py b/gns3server/compute/builtin/nodes/cloud.py index cf0fa44b..d0979d92 100644 --- a/gns3server/compute/builtin/nodes/cloud.py +++ b/gns3server/compute/builtin/nodes/cloud.py @@ -180,6 +180,10 @@ class Cloud(BaseNode): yield from self._ubridge_send("bridge create {name}".format(name=bridge_name)) if not isinstance(nio, NIOUDP): 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"): @@ -209,11 +213,6 @@ class Cloud(BaseNode): rhost=port_info["rhost"], 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: yield from self._ubridge_send('bridge start_capture {name} "{pcap_file}"'.format(name=bridge_name, pcap_file=nio.pcap_output_file))