[Python-checkins] bpo-27500: Fix static version of getaddrinfo to resolve IPv6 (GH-7993)
Yury Selivanov
webhook-mailer at python.org
Thu Jun 28 21:59:43 EDT 2018
https://github.com/python/cpython/commit/d904c238ca3551750cb97d15d827c3e525970867
commit: d904c238ca3551750cb97d15d827c3e525970867
branch: master
author: Yury Selivanov <yury at magic.io>
committer: GitHub <noreply at github.com>
date: 2018-06-28T21:59:32-04:00
summary:
bpo-27500: Fix static version of getaddrinfo to resolve IPv6 (GH-7993)
files:
A Misc/NEWS.d/next/Library/2018-06-28-13-00-12.bpo-27500._s1gZ5.rst
M Lib/asyncio/base_events.py
M Lib/test/test_asyncio/test_base_events.py
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 6b4756ad0882..dc0ca3f02b9b 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -61,6 +61,8 @@
_FATAL_ERROR_IGNORE = (BrokenPipeError,
ConnectionResetError, ConnectionAbortedError)
+_HAS_IPv6 = hasattr(socket, 'AF_INET6')
+
def _format_handle(handle):
cb = handle._callback
@@ -123,7 +125,7 @@ def _ipaddr_info(host, port, family, type, proto):
if family == socket.AF_UNSPEC:
afs = [socket.AF_INET]
- if hasattr(socket, 'AF_INET6'):
+ if _HAS_IPv6:
afs.append(socket.AF_INET6)
else:
afs = [family]
@@ -139,7 +141,10 @@ def _ipaddr_info(host, port, family, type, proto):
try:
socket.inet_pton(af, host)
# The host has already been resolved.
- return af, type, proto, '', (host, port)
+ if _HAS_IPv6 and af == socket.AF_INET6:
+ return af, type, proto, '', (host, port, 0, 0)
+ else:
+ return af, type, proto, '', (host, port)
except OSError:
pass
@@ -1309,7 +1314,6 @@ def _check_sendfile_params(self, sock, file, offset, count):
raise ValueError(
'host/port and sock can not be specified at the same time')
- AF_INET6 = getattr(socket, 'AF_INET6', 0)
if reuse_address is None:
reuse_address = os.name == 'posix' and sys.platform != 'cygwin'
sockets = []
@@ -1349,7 +1353,9 @@ def _check_sendfile_params(self, sock, file, offset, count):
# Disable IPv4/IPv6 dual stack support (enabled by
# default on Linux) which makes a single socket
# listen on both address families.
- if af == AF_INET6 and hasattr(socket, 'IPPROTO_IPV6'):
+ if (_HAS_IPv6 and
+ af == socket.AF_INET6 and
+ hasattr(socket, 'IPPROTO_IPV6')):
sock.setsockopt(socket.IPPROTO_IPV6,
socket.IPV6_V6ONLY,
True)
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index e333950e1e1c..bda8cc6e3a82 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -97,11 +97,11 @@ def test_ipaddr_info(self):
base_events._ipaddr_info('1.2.3.4', 1, INET6, STREAM, TCP))
self.assertEqual(
- (INET6, STREAM, TCP, '', ('::3', 1)),
+ (INET6, STREAM, TCP, '', ('::3', 1, 0, 0)),
base_events._ipaddr_info('::3', 1, INET6, STREAM, TCP))
self.assertEqual(
- (INET6, STREAM, TCP, '', ('::3', 1)),
+ (INET6, STREAM, TCP, '', ('::3', 1, 0, 0)),
base_events._ipaddr_info('::3', 1, UNSPEC, STREAM, TCP))
# IPv6 address with family IPv4.
@@ -1077,6 +1077,26 @@ def test_create_server_stream_bittype(self):
srv.close()
self.loop.run_until_complete(srv.wait_closed())
+ @unittest.skipUnless(hasattr(socket, 'AF_INET6'), 'no IPv6 support')
+ def test_create_server_ipv6(self):
+ async def main():
+ srv = await asyncio.start_server(
+ lambda: None, '::1', 0, loop=self.loop)
+ try:
+ self.assertGreater(len(srv.sockets), 0)
+ finally:
+ srv.close()
+ await srv.wait_closed()
+
+ try:
+ self.loop.run_until_complete(main())
+ except OSError as ex:
+ if (hasattr(errno, 'EADDRNOTAVAIL') and
+ ex.errno == errno.EADDRNOTAVAIL):
+ self.skipTest('failed to bind to ::1')
+ else:
+ raise
+
def test_create_datagram_endpoint_wrong_sock(self):
sock = socket.socket(socket.AF_INET)
with sock:
diff --git a/Misc/NEWS.d/next/Library/2018-06-28-13-00-12.bpo-27500._s1gZ5.rst b/Misc/NEWS.d/next/Library/2018-06-28-13-00-12.bpo-27500._s1gZ5.rst
new file mode 100644
index 000000000000..4762e2795643
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-06-28-13-00-12.bpo-27500._s1gZ5.rst
@@ -0,0 +1 @@
+Fix getaddrinfo to resolve IPv6 addresses correctly.
More information about the Python-checkins
mailing list