Merge pull request #2606 from GNS3/release/v2.2.56.1

Release v2.2.56.1

gns3server/appliances/asterfusion-vAsterNOS-VPP.gns3a

@@ -9,6 +9,7 @@
     "registry_version": 6,
     "status": "stable",
     "maintainer": "Asterfusion Product Team",
+    "maintainer_email": "bd@cloudswit.ch",
     "images": [
         {
             "filename": "AsterNOS-VPP_V6.1-R0101P02_x86.img.gz",

gns3server/crash_report.py

@@ -57,7 +57,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://9b9fce29bf59d9a99c230240e1070600@o19455.ingest.us.sentry.io/38482"
+    DSN = "https://5bfcec70239c428d44aafef68f3eea79@o19455.ingest.us.sentry.io/38482"
     _instance = None
 
     def __init__(self):

gns3server/run.py

@@ -235,9 +235,9 @@ def run():
             return
         log.info("HTTP authentication is enabled with username '{}'".format(user))
 
-    # we only support Python 3 version >= 3.8
-    if sys.version_info < (3, 8, 0):
-        raise SystemExit("Python 3.8 or higher is required")
+    # we only support Python 3 version >= 3.9
+    if sys.version_info < (3, 9, 0):
+        raise SystemExit("Python 3.9 or higher is required")
 
     user_log.info("Running with Python {major}.{minor}.{micro} and has PID {pid}".format(major=sys.version_info[0], minor=sys.version_info[1],
                                                                                          micro=sys.version_info[2], pid=os.getpid()))

gns3server/utils/asyncio/__init__.py

@@ -91,25 +91,16 @@ async def wait_for_process_termination(process, timeout=10):
     In theory this can be implemented by just:
     await asyncio.wait_for(self._iou_process.wait(), timeout=100)
 
-    But it's broken before Python 3.4:
-    http://bugs.python.org/issue23140
-
     :param process: An asyncio subprocess
     :param timeout: Timeout in seconds
     """
 
-    if sys.version_info >= (3, 5):
-        try:
-            await asyncio.wait_for(process.wait(), timeout=timeout)
-        except ProcessLookupError:
+    while timeout > 0:
+        if process.returncode is not None:
             return
-    else:
-        while timeout > 0:
-            if process.returncode is not None:
-                return
-            await asyncio.sleep(0.1)
-            timeout -= 0.1
-        raise asyncio.TimeoutError()
+        await asyncio.sleep(0.1)
+        timeout -= 0.1
+    raise asyncio.TimeoutError()
 
 
 async def _check_process(process, termination_callback):

gns3server/utils/asyncio/pool.py

@@ -40,10 +40,7 @@ class Pool():
         while len(self._tasks) > 0 or len(pending) > 0:
             while len(self._tasks) > 0 and len(pending) < self._concurrency:
                 task, args, kwargs = self._tasks.pop(0)
-                if sys.version_info >= (3, 7):
-                    t = asyncio.create_task(task(*args, **kwargs))
-                else:
-                    t = asyncio.get_event_loop().create_task(task(*args, **kwargs))
+                t = asyncio.create_task(task(*args, **kwargs))
                 pending.add(t)
             (done, pending) = await asyncio.wait(pending, return_when=asyncio.FIRST_COMPLETED)
             for task in done:

gns3server/utils/asyncio/telnet_server.py

@@ -186,15 +186,25 @@ class AsyncioTelnetServer:
         await writer.drain()
 
     async def run(self, network_reader, network_writer):
-
         sock = network_writer.get_extra_info("socket")
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
         sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         # 60 sec keep alives, close tcp session after 4 missed
         # Will keep a firewall from aging out telnet console.
-        sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, 60)
-        sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 10)
-        sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 4)
+        try:
+            # Keepalive options are platform dependent: Linux uses TCP_KEEPIDLE,
+            # while macOS exposes TCP_KEEPALIVE (in Python >= 3.10).
+            if hasattr(socket, "TCP_KEEPIDLE"):
+                sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, 60)
+            elif hasattr(socket, "TCP_KEEPALIVE"):
+                sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPALIVE, 60)
+            else:
+                raise AttributeError("module 'socket' has no attribute 'TCP_KEEPIDLE' or 'TCP_KEEPALIVE'")
+            sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 10)
+            sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 4)
+        except (AttributeError, OSError):
+            log.debug("Failed to tune TCP keepalive for telnet client; using OS defaults", exc_info=True)
+
         #log.debug("New connection from {}".format(sock.getpeername()))
 
         # Keep track of connected clients

gns3server/version.py

@@ -23,7 +23,7 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "2.2.56"
+__version__ = "2.2.56.1"
 __version_info__ = (2, 2, 56, 0)
 
 if "dev" in __version__: