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

Merge branch '2.2' into 3.0

Browse Source 
# Conflicts:
#	.github/workflows/testing.yml
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/run.py
#	requirements.txt
#	setup.py
#	tests/compute/docker/test_docker_vm.py
This commit is contained in:
grossmj 2024-02-21 12:24:30 +08:00
commit 800920e3df
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/compute/docker/__init__.py
View File

@ -193,8 +193,8 @@ class Docker(BaseManager):
if timeout is None: if timeout is None:
timeout = 60 * 60 * 24 * 31 # One month timeout timeout = 60 * 60 * 24 * 31 # One month timeout
if path == "version": if path == 'version':
url = "http://docker/v1.12/" + path # API of docker v1.0 url = "http://docker/v1.24/" + path
else: else:
url = "http://docker/v" + DOCKER_MINIMUM_API_VERSION + "/" + path url = "http://docker/v" + DOCKER_MINIMUM_API_VERSION + "/" + path
try: try:

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

@ -291,9 +291,17 @@ class AsyncioTelnetServer:
reader_read = await self._get_reader(network_reader) reader_read = await self._get_reader(network_reader)
# Replicate the output on all clients # Replicate the output on all clients
for connection in self._connections.values(): for connection_key in list(self._connections.keys()):
client_info = connection_key.get_extra_info("socket").getpeername()
connection = self._connections[connection_key]
try:
connection.writer.write(data) connection.writer.write(data)
await connection.writer.drain() await asyncio.wait_for(connection.writer.drain(), timeout=10)
except:
log.debug(f"Timeout while sending data to client: {client_info}, closing and removing from connection table.")
connection.close()
del self._connections[connection_key]
async def _read(self, cmd, buffer, location, reader): async def _read(self, cmd, buffer, location, reader):
""" Reads next op from the buffer or reader""" """ Reads next op from the buffer or reader"""