Merge 2.2

2025-06-22 00:41:56 +00:00 · 2023-01-05 12:38:00 +08:00
parent f837912ebc f8f5d7ec07
commit 27d9063e56
21 changed files with 301 additions and 50 deletions
--- a/gns3server/utils/asyncio/telnet_server.py
+++ b/gns3server/utils/asyncio/telnet_server.py
@ -200,6 +200,7 @@ class AsyncioTelnetServer:
        except ConnectionError:
            async with self._lock:
                network_writer.close()
+                await network_writer.wait_closed()
                if self._reader_process == network_reader:
                    self._reader_process = None
                    # Cancel current read from this reader
@ -214,6 +215,8 @@ class AsyncioTelnetServer:
            try:
                writer.write_eof()
                await writer.drain()
+                writer.close()
+                await writer.wait_closed()
            except (AttributeError, ConnectionError):
                continue