summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/windows_events.py
diff options
context:
space:
mode:
authorErik Soma <stillusingirc@gmail.com>2024-03-23 15:39:35 (GMT)
committerGitHub <noreply@github.com>2024-03-23 15:39:35 (GMT)
commitf11d0d8be8af28e1368c3c7c116218cf65ddf93e (patch)
tree0bbe9b536a17f8417cda142808be37adb113b217 /Lib/asyncio/windows_events.py
parent9967b568edd2e35b0415c14c7242f3ca2c0dc03d (diff)
downloadcpython-f11d0d8be8af28e1368c3c7c116218cf65ddf93e.zip
cpython-f11d0d8be8af28e1368c3c7c116218cf65ddf93e.tar.gz
cpython-f11d0d8be8af28e1368c3c7c116218cf65ddf93e.tar.bz2
gh-91227: Ignore ERROR_PORT_UNREACHABLE in proactor recvfrom() (#32011)
Diffstat (limited to 'Lib/asyncio/windows_events.py')
-rw-r--r--Lib/asyncio/windows_events.py29
1 files changed, 17 insertions, 12 deletions
diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py
index aca063e..bf99bc2 100644
--- a/Lib/asyncio/windows_events.py
+++ b/Lib/asyncio/windows_events.py
@@ -8,6 +8,7 @@ if sys.platform != 'win32': # pragma: no cover
import _overlapped
import _winapi
import errno
+from functools import partial
import math
import msvcrt
import socket
@@ -467,6 +468,18 @@ class IocpProactor:
else:
raise
+ @classmethod
+ def _finish_recvfrom(cls, trans, key, ov, *, empty_result):
+ try:
+ return cls.finish_socket_func(trans, key, ov)
+ except OSError as exc:
+ # WSARecvFrom will report ERROR_PORT_UNREACHABLE when the same
+ # socket is used to send to an address that is not listening.
+ if exc.winerror == _overlapped.ERROR_PORT_UNREACHABLE:
+ return empty_result, None
+ else:
+ raise
+
def recv(self, conn, nbytes, flags=0):
self._register_with_iocp(conn)
ov = _overlapped.Overlapped(NULL)
@@ -501,7 +514,8 @@ class IocpProactor:
except BrokenPipeError:
return self._result((b'', None))
- return self._register(ov, conn, self.finish_socket_func)
+ return self._register(ov, conn, partial(self._finish_recvfrom,
+ empty_result=b''))
def recvfrom_into(self, conn, buf, flags=0):
self._register_with_iocp(conn)
@@ -511,17 +525,8 @@ class IocpProactor:
except BrokenPipeError:
return self._result((0, None))
- def finish_recv(trans, key, ov):
- try:
- return ov.getresult()
- except OSError as exc:
- if exc.winerror in (_overlapped.ERROR_NETNAME_DELETED,
- _overlapped.ERROR_OPERATION_ABORTED):
- raise ConnectionResetError(*exc.args)
- else:
- raise
-
- return self._register(ov, conn, finish_recv)
+ return self._register(ov, conn, partial(self._finish_recvfrom,
+ empty_result=0))
def sendto(self, conn, buf, flags=0, addr=None):
self._register_with_iocp(conn)