diff options
| author | Vincent Michel <vxgmichel@gmail.com> | 2019-05-07 17:18:49 (GMT) |
|---|---|---|
| committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-05-07 17:18:49 (GMT) |
| commit | 63deaa5b70108ef441c57728322da6b4321db4fc (patch) | |
| tree | 79e5e4911d6a0d6460d36355d394c969b98f437b /Lib/asyncio/base_events.py | |
| parent | 91cc01f40eec03ece2d6b04ad9ea786e77707d8d (diff) | |
| download | cpython-63deaa5b70108ef441c57728322da6b4321db4fc.zip cpython-63deaa5b70108ef441c57728322da6b4321db4fc.tar.gz cpython-63deaa5b70108ef441c57728322da6b4321db4fc.tar.bz2 | |
bpo-31922: Do not connect UDP sockets when broadcast is allowed (GH-423)
*Moved from python/asyncio#493.*
This PR fixes issue python/asyncio#480, as explained in [this comment](https://github.com/python/asyncio/issues/480#issuecomment-278703828).
The `_SelectorDatagramTransport.sendto` method has to be modified ~~so `_sock.sendto` is used in all cases (because it is tricky to reliably tell if the socket is connected or not). Could that be an issue for connected sockets?~~ *EDIT* ... so `_sock.send` is used only if `_sock` is connected.
It also protects `socket.getsockname` against `OSError` in `_SelectorTransport`. This might happen on Windows if the socket is not connected (e.g. for UDP broadcasting).
https://bugs.python.org/issue31922
Diffstat (limited to 'Lib/asyncio/base_events.py')
| -rw-r--r-- | Lib/asyncio/base_events.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index c58906f..9613ac2 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -1306,7 +1306,8 @@ class BaseEventLoop(events.AbstractEventLoop): if local_addr: sock.bind(local_address) if remote_addr: - await self.sock_connect(sock, remote_address) + if not allow_broadcast: + await self.sock_connect(sock, remote_address) r_addr = remote_address except OSError as exc: if sock is not None: |