Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-10 19:47:14 +08:00
Code Issues Releases Wiki Activity

[utils] Fix --force-ipv4, --force-ipv6, --source-address

Browse Source
This commit is contained in:
Andrew Udvare 2018-08-27 14:43:08 -04:00
parent 835f22816d
commit d16c33ffe2
No known key found for this signature in database
GPG Key ID: 1AFD9AFC120C26DD
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/utils.py
View File

@ -884,9 +884,7 @@ def _create_http_connection(ydl_handler, http_class, is_https, *args, **kwargs):
source_address = ydl_handler._params.get('source_address')
if source_address is not None:
filter_for = socket.AF_INET
if '.' not in source_address:
filter_for = socket.AF_INET6
filter_for = socket.AF_INET if '.' in source_address else socket.AF_INET6
# This is to workaround _create_connection() from socket where it will try all
# address data from getaddrinfo() including IPv6. This filters the result from
# getaddrinfo() based on the source_address value.
@ -896,8 +894,8 @@ def _create_http_connection(ydl_handler, http_class, is_https, *args, **kwargs):
host, port = address
err = None
addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)
ipv4_addrs = [addr for addr in addrs if addr[0] == filter_for]
for res in ipv4_addrs:
ip_addrs = [addr for addr in addrs if addr[0] == filter_for]
for res in ip_addrs:
af, socktype, proto, canonname, sa = res
sock = None
try:
@ -915,7 +913,7 @@ def _create_http_connection(ydl_handler, http_class, is_https, *args, **kwargs):
if err is not None:
raise err
else:
raise socket.error("getaddrinfo returns an empty list")
raise socket.error('Unknown error occurred')
hc._create_connection = _create_connection
sa = (source_address, 0)