Add proto to sock_connect

Aperence · Aperence · commit 9e19f406f848 · 2024-08-20T14:50:18.000+02:00
Allow the selection of the protocol used by getaddrinfo by adding an additional, optional parameter proto_addr_info. If not specified, use the protocol used by the socket (= previous behaviour) This change is needed to allow custom protocols to be used with the sock_connect, because these protocols may raise an error when calling getaddrinfo (result in a "ai_proto not supported" error) An example of such protocol is MPTCP (https://mptcp.dev)
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
@@ -618,19 +618,24 @@ def _sock_sendto(self, fut, sock, data, address):
         else:
             fut.set_result(n)
 
-    async def sock_connect(self, sock, address):
+    async def sock_connect(self, sock, address, proto_addr_info = None):
         """Connect to a remote socket at address.
 
         This method is a coroutine.
+        
+        The proto_addr info parameter allows to specify a protocol to use for the 
+        resolution of the address. If not specified, default to the protocol used
+        by sock
         """
         base_events._check_ssl_socket(sock)
         if self._debug and sock.gettimeout() != 0:
             raise ValueError("the socket must be non-blocking")
 
         if sock.family == socket.AF_INET or (
                 base_events._HAS_IPv6 and sock.family == socket.AF_INET6):
+            proto = proto_addr_info if proto_addr_info is not None else sock.proto
             resolved = await self._ensure_resolved(
-                address, family=sock.family, type=sock.type, proto=sock.proto,
+                address, family=sock.family, type=sock.type, proto=proto,
                 loop=self,
             )
             _, _, _, _, address = resolved[0]
