From c70b344133d692dc499a1e27063b424ddd35aef2 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 21 Mar 2019 11:41:44 +0800 Subject: [PATCH 1/4] Release v2.1.15 --- CHANGELOG | 5 +++++ gns3server/crash_report.py | 2 +- gns3server/version.py | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f2680b739..140a190a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ # Change Log +## 2.1.15 21/03/2019 + +* Fix IOU symlink issue on remote servers. +* Fix vcpus configuration for GNS3 VM on VMware. Ref #2738. + ## 2.1.14 27/02/2019 * Fix issue when setting cpuid.corespersocket for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2723 diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index 547c9c02c..1f08b7945 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -57,7 +57,7 @@ class CrashReport: Report crash to a third party service """ - DSN = "https://3abf3feab0b14c51bfecaa170e846bb9:54b92432fbe94f0e9afe4cbf0dad0126@sentry.io/38482" + DSN = "https://a42f17beb052442095199b5cd8a0c910:b798e3e3699e437882de7285370ed063@sentry.io/38482" if hasattr(sys, "frozen"): cacert = get_resource("cacert.pem") if cacert is not None and os.path.isfile(cacert): diff --git a/gns3server/version.py b/gns3server/version.py index 1bbb3f808..d72b86cd4 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,8 +23,8 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.1.15dev1" -__version_info__ = (2, 1, 15, 99) +__version__ = "2.1.15" +__version_info__ = (2, 1, 15, 0) # If it's a git checkout try to add the commit if "dev" in __version__: From 645031ee15f970d2ae8a1980aa021fb5452c53ea Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 21 Mar 2019 13:56:11 +0800 Subject: [PATCH 2/4] Development on 2.1.16dev1 --- gns3server/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gns3server/version.py b/gns3server/version.py index d72b86cd4..cf5a3a0fd 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,8 +23,8 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.1.15" -__version_info__ = (2, 1, 15, 0) +__version__ = "2.1.16dev1" +__version_info__ = (2, 1, 16, 99) # If it's a git checkout try to add the commit if "dev" in __version__: From 8cd66cfc02d5bc5fd6b24668d60ebfc20562f13a Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 9 Apr 2019 19:26:07 +0700 Subject: [PATCH 3/4] Remove old unused argument option. Fixes #1569 --- gns3server/run.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gns3server/run.py b/gns3server/run.py index c3b4bc279..df2c691d9 100644 --- a/gns3server/run.py +++ b/gns3server/run.py @@ -91,7 +91,6 @@ def parse_arguments(argv): parser.add_argument("--host", help="run on the given host/IP address") parser.add_argument("--port", help="run on the given port", type=int) parser.add_argument("--ssl", action="store_true", help="run in SSL mode") - parser.add_argument("--no-ubridge", action="store_false", help="do not use ubridge to handle node connections") parser.add_argument("--config", help="Configuration file") parser.add_argument("--certfile", help="SSL cert file") parser.add_argument("--certkey", help="SSL key file") From cc1980ac1c103cf78553a98a2d22c23d580774f0 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 11 Apr 2019 17:57:47 +0700 Subject: [PATCH 4/4] Fix broken embedded console for Ethernet switch. Fixes #1574 --- gns3server/utils/asyncio/embed_shell.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gns3server/utils/asyncio/embed_shell.py b/gns3server/utils/asyncio/embed_shell.py index 4797c6f28..6eb132ddf 100644 --- a/gns3server/utils/asyncio/embed_shell.py +++ b/gns3server/utils/asyncio/embed_shell.py @@ -198,8 +198,8 @@ class UnstoppableEventLoop(EventLoop): class ShellConnection(TelnetConnection): - def __init__(self, reader, writer, shell, loop): - super(ShellConnection, self).__init__(reader, writer) + def __init__(self, reader, writer, shell, window_size_changed_callback, loop): + super(ShellConnection, self).__init__(reader, writer, window_size_changed_callback) self._shell = shell self._loop = loop self._cli = None @@ -239,9 +239,12 @@ class ShellConnection(TelnetConnection): def disconnected(self): pass + @asyncio.coroutine def window_size_changed(self, columns, rows): self._size = Size(rows=rows, columns=columns) self._cb.terminal_size_changed() + if self._window_size_changed_callback: + yield from self._window_size_changed_callback(columns, rows) @asyncio.coroutine def feed(self, data): @@ -291,8 +294,8 @@ def create_telnet_shell(shell, loop=None): if loop is None: loop = asyncio.get_event_loop() - def factory(reader, writer): - return ShellConnection(reader, writer, shell, loop) + def factory(reader, writer, window_size_changed_callback): + return ShellConnection(reader, writer, shell, window_size_changed_callback, loop) return AsyncioTelnetServer(binary=True, echo=True, naws=True, connection_factory=factory)