ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-24 06:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix reset console. Fixes #1619

Browse Source
This commit is contained in:
grossmj 2022-12-31 09:43:17 +08:00
parent 2d6b260188
commit b3a6b9173b
4 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gns3server/compute/base_node.py
View File

@ -77,6 +77,8 @@ class BaseNode:
self._allocate_aux = allocate_aux self._allocate_aux = allocate_aux
self._wrap_console = wrap_console self._wrap_console = wrap_console
self._wrapper_telnet_server = None self._wrapper_telnet_server = None
self._wrap_console_reader = None
self._wrap_console_writer = None
self._internal_console_port = None self._internal_console_port = None
self._custom_adapters = [] self._custom_adapters = []
self._ubridge_require_privileged_access = False self._ubridge_require_privileged_access = False
@ -338,7 +340,6 @@ class BaseNode:
if self._wrap_console: if self._wrap_console:
self._manager.port_manager.release_tcp_port(self._internal_console_port, self._project) self._manager.port_manager.release_tcp_port(self._internal_console_port, self._project)
self._internal_console_port = None self._internal_console_port = None
if self._aux: if self._aux:
self._manager.port_manager.release_tcp_port(self._aux, self._project) self._manager.port_manager.release_tcp_port(self._aux, self._project)
self._aux = None self._aux = None
@ -376,15 +377,23 @@ class BaseNode:
remaining_trial = 60 remaining_trial = 60
while True: while True:
try: try:
(reader, writer) = await asyncio.open_connection(host="127.0.0.1", port=self._internal_console_port) (self._wrap_console_reader, self._wrap_console_writer) = await asyncio.open_connection(
host="127.0.0.1",
port=self._internal_console_port
)
break break
except (OSError, ConnectionRefusedError) as e: except (OSError, ConnectionRefusedError) as e:
if remaining_trial <= 0: if remaining_trial <= 0:
raise e raise e
await asyncio.sleep(0.1) await asyncio.sleep(0.1)
remaining_trial -= 1 remaining_trial -= 1
await AsyncioTelnetServer.write_client_intro(writer, echo=True) await AsyncioTelnetServer.write_client_intro(self._wrap_console_writer, echo=True)
server = AsyncioTelnetServer(reader=reader, writer=writer, binary=True, echo=True) server = AsyncioTelnetServer(
reader=self._wrap_console_reader,
writer=self._wrap_console_writer,
binary=True,
echo=True
)
# warning: this will raise OSError exception if there is a problem... # warning: this will raise OSError exception if there is a problem...
self._wrapper_telnet_server = await asyncio.start_server( self._wrapper_telnet_server = await asyncio.start_server(
server.run, server.run,
@ -398,8 +407,19 @@ class BaseNode:
""" """
if self._wrapper_telnet_server: if self._wrapper_telnet_server:
self._wrap_console_writer.close()
await self._wrap_console_writer.wait_closed()
self._wrapper_telnet_server.close() self._wrapper_telnet_server.close()
await self._wrapper_telnet_server.wait_closed() await self._wrapper_telnet_server.wait_closed()
self._wrapper_telnet_server = None
async def reset_wrap_console(self):
"""
Reset the wrap console (restarts the Telnet proxy)
"""
await self.stop_wrap_console()
await self.start_wrap_console()
async def start_websocket_console(self, request): async def start_websocket_console(self, request):
""" """

3
gns3server/compute/qemu/qemu_vm.py
View File

@ -1572,9 +1572,8 @@ class QemuVM(BaseNode):
Reset console Reset console
""" """
await self.stop_wrap_console()
if self.is_running(): if self.is_running():
await self.start_wrap_console() await self.reset_wrap_console()
def command(self): def command(self):
""" """

3
gns3server/compute/vpcs/vpcs_vm.py
View File

@ -349,9 +349,8 @@ class VPCSVM(BaseNode):
Reset console Reset console
""" """
await self.stop_wrap_console()
if self.is_running(): if self.is_running():
await self.start_wrap_console() await self.reset_wrap_console()
@BaseNode.console_type.setter @BaseNode.console_type.setter
def console_type(self, new_console_type): def console_type(self, new_console_type):

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

@ -189,7 +189,6 @@ class AsyncioTelnetServer:
sock = network_writer.get_extra_info("socket") sock = network_writer.get_extra_info("socket")
sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
#log.debug("New connection from {}".format(sock.getpeername())) #log.debug("New connection from {}".format(sock.getpeername()))
# Keep track of connected clients # Keep track of connected clients