arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 03:08:14 +00:00
Code Issues Releases Wiki Activity

Merge 2.1 into 2.2

Browse Source
This commit is contained in:
grossmj 2019-04-13 18:39:06 +07:00
commit 6db8cecda5
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -28,6 +28,11 @@
* Save the GNS3 VM settings even if the GNS3 VM cannot be stopped. * Save the GNS3 VM settings even if the GNS3 VM cannot be stopped.
* Fix exception when emitting event from controller. Ref https://github.com/GNS3/gns3-gui/issues/2737 * Fix exception when emitting event from controller. Ref https://github.com/GNS3/gns3-gui/issues/2737
## 2.1.15 21/03/2019
* Fix IOU symlink issue on remote servers.
* Fix vcpus configuration for GNS3 VM on VMware. Ref #2738.
## 2.2.0a2 14/03/2019 ## 2.2.0a2 14/03/2019
* Web-UI v2019.1.0-alpha.1 * Web-UI v2019.1.0-alpha.1

1
gns3server/run.py
View File

@ -91,7 +91,6 @@ def parse_arguments(argv):
parser.add_argument("--host", help="run on the given host/IP address") 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("--port", help="run on the given port", type=int)
parser.add_argument("--ssl", action="store_true", help="run in SSL mode") 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("--config", help="Configuration file")
parser.add_argument("--certfile", help="SSL cert file") parser.add_argument("--certfile", help="SSL cert file")
parser.add_argument("--certkey", help="SSL key file") parser.add_argument("--certkey", help="SSL key file")

11
gns3server/utils/asyncio/embed_shell.py
View File

@ -195,8 +195,8 @@ class UnstoppableEventLoop(EventLoop):
class ShellConnection(TelnetConnection): class ShellConnection(TelnetConnection):
def __init__(self, reader, writer, shell, loop): def __init__(self, reader, writer, shell, window_size_changed_callback, loop):
super(ShellConnection, self).__init__(reader, writer) super(ShellConnection, self).__init__(reader, writer, window_size_changed_callback)
self._shell = shell self._shell = shell
self._loop = loop self._loop = loop
self._cli = None self._cli = None
@ -234,9 +234,12 @@ class ShellConnection(TelnetConnection):
async def disconnected(self): async def disconnected(self):
pass pass
@asyncio.coroutine
def window_size_changed(self, columns, rows): def window_size_changed(self, columns, rows):
self._size = Size(rows=rows, columns=columns) self._size = Size(rows=rows, columns=columns)
self._cb.terminal_size_changed() self._cb.terminal_size_changed()
if self._window_size_changed_callback:
yield from self._window_size_changed_callback(columns, rows)
async def feed(self, data): async def feed(self, data):
data = data.decode() data = data.decode()
@ -285,8 +288,8 @@ def create_telnet_shell(shell, loop=None):
if loop is None: if loop is None:
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
def factory(reader, writer): def factory(reader, writer, window_size_changed_callback):
return ShellConnection(reader, writer, shell, loop) return ShellConnection(reader, writer, shell, window_size_changed_callback, loop)
return AsyncioTelnetServer(binary=True, echo=True, naws=True, connection_factory=factory) return AsyncioTelnetServer(binary=True, echo=True, naws=True, connection_factory=factory)