From b19bfa027052989e2fdc49942160d45389e8453e Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Wed, 7 Oct 2015 18:24:03 +0200 Subject: [PATCH 1/3] 1.3.11 release --- CHANGELOG | 13 +++++++++++++ gns3server/version.py | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1a06415e..004dcb14 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,18 @@ # Change Log +# 1.3.11 07/10/2015 + +* Escape other usage of glob +* Fix Dynamips identifier is already used by another router +* Protect dynamips against bad glob +* Catch ProcessLookupError in Qemu VM. +* Use the correct UDP tunnel Qemu syntax for version > 1.1.0 when legacy networking is enabled. +* Prevent launching a packet capture with a non-ASCII path when using Dynamips. +* Do not automatically delete Dynamips bootflash file because they are necessary to restore VLANs on the c3600 platform. +* Fix dynamips configuration lost when you delete a node +* Clarify error message when we got UTF-8 chars in the iourc file +* Check for valid FR or ATM switch mappings. Fixes #300. + ## 1.3.10 04/09/2015 * Catch exception when a process cannot be killed. Fixes #296. diff --git a/gns3server/version.py b/gns3server/version.py index 327af999..ce729c93 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,5 +23,5 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "1.3.11dev1" -__version_info__ = (1, 3, 11, -99) +__version__ = "1.3.11" +__version_info__ = (1, 3, 11, 0) From 6cd790880c326b06b5ec677c0711ef404acd8d80 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Wed, 7 Oct 2015 18:26:18 +0200 Subject: [PATCH 2/3] 1.3.12dev1 --- gns3server/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gns3server/version.py b/gns3server/version.py index ce729c93..4193a576 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,5 +23,5 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "1.3.11" -__version_info__ = (1, 3, 11, 0) +__version__ = "1.3.12dev1" +__version_info__ = (1, 3, 12, -99) From a6286db7b187ac28f7d2a93d37525835f6860d09 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 7 Oct 2015 20:48:36 -0600 Subject: [PATCH 3/3] Release UDP ports when closing a Qemu VM. Fixes #323. --- gns3server/modules/qemu/qemu_vm.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gns3server/modules/qemu/qemu_vm.py b/gns3server/modules/qemu/qemu_vm.py index 616b74dd..84baaccc 100644 --- a/gns3server/modules/qemu/qemu_vm.py +++ b/gns3server/modules/qemu/qemu_vm.py @@ -665,11 +665,19 @@ class QemuVM(BaseVM): """ log.debug('QEMU VM "{name}" [{id}] is closing'.format(name=self._name, id=self._id)) - yield from self.stop() + if self._console: self._manager.port_manager.release_tcp_port(self._console, self._project) self._console = None + for adapter in self._ethernet_adapters: + if adapter is not None: + for nio in adapter.ports.values(): + if nio and isinstance(nio, NIOUDP): + self.manager.port_manager.release_udp_port(nio.lport, self._project) + + yield from self.stop() + @asyncio.coroutine def _get_vm_status(self): """