pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix dns resolution without aiodns

Browse source 
(use loop.getaddrinfo instead of the blocking version)
This commit is contained in:
mathieui 2015-02-24 19:00:37 +01:00
parent dbd8115557
commit 8ac0ecdf40
No known key found for this signature in database
GPG key ID: C59F84CEEFD616E3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
slixmpp/xmlstream/resolver.py
View file

@ -177,9 +177,11 @@ def get_A(host, resolver=None, use_aiodns=True):
# If not using aiodns, attempt lookup using the OS level # If not using aiodns, attempt lookup using the OS level
# getaddrinfo() method. # getaddrinfo() method.
if resolver is None or not use_aiodns: if resolver is None or not use_aiodns:
loop = asyncio.get_event_loop()
try: try:
recs = socket.getaddrinfo(host, None, socket.AF_INET, recs = yield from loop.getaddrinfo(host, None,
socket.SOCK_STREAM) family=socket.AF_INET,
type=socket.SOCK_STREAM)
return [rec[4][0] for rec in recs] return [rec[4][0] for rec in recs]
except socket.gaierror: except socket.gaierror:
log.debug("DNS: Error retrieving A address info for %s." % host) log.debug("DNS: Error retrieving A address info for %s." % host)
@ -222,9 +224,11 @@ def get_AAAA(host, resolver=None, use_aiodns=True):
if not socket.has_ipv6: if not socket.has_ipv6:
log.debug("DNS: Unable to query %s for AAAA records: IPv6 is not supported", host) log.debug("DNS: Unable to query %s for AAAA records: IPv6 is not supported", host)
return [] return []
loop = asyncio.get_event_loop()
try: try:
recs = socket.getaddrinfo(host, None, socket.AF_INET6, recs = yield from loop.getaddrinfo(host, None,
socket.SOCK_STREAM) family=socket.AF_INET6,
type=socket.SOCK_STREAM)
return [rec[4][0] for rec in recs] return [rec[4][0] for rec in recs]
except (OSError, socket.gaierror): except (OSError, socket.gaierror):
log.debug("DNS: Error retreiving AAAA address " + \ log.debug("DNS: Error retreiving AAAA address " + \