arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-07-09 16:18:29 +00:00
Code Issues Releases Wiki Activity

Add sftelnetproxymuxer support

Browse Source
This commit is contained in:
John Fleming 2024-01-28 08:33:10 -05:00
parent e39b317185
commit 1c4347b058
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gns3server/compute/base_node.py
View File

@ -31,7 +31,8 @@ from aiohttp.web import WebSocketResponse
from gns3server.utils.interfaces import interfaces from gns3server.utils.interfaces import interfaces
from ..compute.port_manager import PortManager from ..compute.port_manager import PortManager
from ..utils.asyncio import wait_run_in_executor, locking from ..utils.asyncio import wait_run_in_executor, locking
from ..utils.asyncio.telnet_server import AsyncioTelnetServer #from ..utils.asyncio.telnet_server import AsyncioTelnet
from ..utils.asyncio.sftelnetproxymuxer import SFTelnetProxyMuxer
from ..ubridge.hypervisor import Hypervisor from ..ubridge.hypervisor import Hypervisor
from ..ubridge.ubridge_error import UbridgeError from ..ubridge.ubridge_error import UbridgeError
from .nios.nio_udp import NIOUDP from .nios.nio_udp import NIOUDP
@ -375,6 +376,7 @@ class BaseNode:
if not self._wrap_console or self._console_type != "telnet": if not self._wrap_console or self._console_type != "telnet":
return return
remaining_trial = 60 remaining_trial = 60
log.info(f"Internal_console_port: {self._internal_console_port}")
while True: while True:
try: try:
(self._wrap_console_reader, self._wrap_console_writer) = await asyncio.open_connection( (self._wrap_console_reader, self._wrap_console_writer) = await asyncio.open_connection(
@ -387,6 +389,7 @@ class BaseNode:
raise e raise e
await asyncio.sleep(0.1) await asyncio.sleep(0.1)
remaining_trial -= 1 remaining_trial -= 1
## no longer needed. SFTelnetProxyMuxer handles client handshake
await AsyncioTelnetServer.write_client_intro(self._wrap_console_writer, echo=True) await AsyncioTelnetServer.write_client_intro(self._wrap_console_writer, echo=True)
server = AsyncioTelnetServer( server = AsyncioTelnetServer(
reader=self._wrap_console_reader, reader=self._wrap_console_reader,
@ -395,6 +398,8 @@ class BaseNode:
echo=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...
log.info(f"self._manager.port_manager.console_host: {self._manager.port_manager.console_host}")
log.info(f"self.console {self.console}")
self._wrapper_telnet_server = await asyncio.start_server( self._wrapper_telnet_server = await asyncio.start_server(
server.run, server.run,
self._manager.port_manager.console_host, self._manager.port_manager.console_host,