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

Merge remote-tracking branch 'origin/2.1' into 2.1

Browse Source
This commit is contained in:
grossmj 2017-11-23 10:04:46 +07:00
commit 958ab2294c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/compute/dynamips/nodes/ethernet_switch.py
View File

@ -166,8 +166,8 @@ class EthernetSwitch(Device):
self._telnet_shell = EthernetSwitchConsole(self) self._telnet_shell = EthernetSwitchConsole(self)
self._telnet_shell.prompt = self._name + '> ' self._telnet_shell.prompt = self._name + '> '
telnet = create_telnet_shell(self._telnet_shell) self._telnet = create_telnet_shell(self._telnet_shell)
self._telnet_server = (yield from asyncio.start_server(telnet.run, self._manager.port_manager.console_host, self.console)) self._telnet_server = (yield from asyncio.start_server(self._telnet.run, self._manager.port_manager.console_host, self.console))
self._hypervisor.devices.append(self) self._hypervisor.devices.append(self)
@ -214,6 +214,8 @@ class EthernetSwitch(Device):
""" """
Deletes this Ethernet switch. Deletes this Ethernet switch.
""" """
yield from self._telnet.close()
self._telnet_server.close()
for nio in self._nios.values(): for nio in self._nios.values():
if nio: if nio:

6
gns3server/utils/asyncio/telnet_server.py
View File

@ -209,6 +209,12 @@ class AsyncioTelnetServer:
yield from connection.disconnected() yield from connection.disconnected()
del self._connections[network_writer] del self._connections[network_writer]
@asyncio.coroutine
def close(self):
for writer, connection in self._connections.items():
writer.write_eof()
yield from writer.drain()
@asyncio.coroutine @asyncio.coroutine
def client_connected_hook(self): def client_connected_hook(self):
pass pass