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

Make the use of IPv6 configurable.

Browse source 
Set self.use_ipv6 = False before connecting.

Fixes issue #175
This commit is contained in:
Lance Stout 2012-06-20 19:29:08 -07:00
parent 36c11ad9de
commit e86444e5fb
2 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sleekxmpp/xmlstream/resolver.py
View file

@ -52,7 +52,8 @@ def default_resolver():
return None
def resolve(host, port=None, service=None, proto='tcp', resolver=None):
def resolve(host, port=None, service=None, proto='tcp',
resolver=None, use_ipv6=True):
"""Peform DNS resolution for a given hostname.
Resolution may perform SRV record lookups if a service and protocol
@ -73,16 +74,23 @@ def resolve(host, port=None, service=None, proto='tcp', resolver=None):
:param proto: Optional SRV protocol name without leading underscore.
:param resolver: Optionally provide a DNS resolver object that has
been custom configured.
:param use_ipv6: Optionally control the use of IPv6 in situations
where it is either not available, or performance
is degraded. Defaults to ``True``.
:type host: string
:type port: int
:type service: string
:type proto: string
:type resolver: :class:`dns.resolver.Resolver`
:type use_ipv6: bool
:return: An iterable of IP address, port pairs in the order
dictated by SRV priorities and weights, if applicable.
"""
if not use_ipv6:
log.debug("DNS: Use of IPv6 has been disabled.")
if resolver is None and USE_DNSPYTHON:
resolver = dns.resolver.get_default_resolver()
@ -98,8 +106,10 @@ def resolve(host, port=None, service=None, proto='tcp', resolver=None):
except socket.error:
pass
if use_ipv6:
try:
# Likewise, If `host` is an IPv6 literal, we can return it immediately.
# Likewise, If `host` is an IPv6 literal, we can return
# it immediately.
if hasattr(socket, 'inet_pton'):
ipv6 = socket.inet_pton(socket.AF_INET6, host)
yield (host, port)
@ -117,8 +127,10 @@ def resolve(host, port=None, service=None, proto='tcp', resolver=None):
for host, port in hosts:
results = []
if host == 'localhost':
if use_ipv6:
results.append(('::1', port))
results.append(('127.0.0.1', port))
if use_ipv6:
for address in get_AAAA(host, resolver=resolver):
results.append((address, port))
for address in get_A(host, resolver=resolver):
@ -160,13 +172,13 @@ def get_A(host, resolver=None):
recs = resolver.query(host, dns.rdatatype.A)
return [rec.to_text() for rec in recs]
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
log.debug("DNS: No A records for %s." % host)
log.debug("DNS: No A records for %s" % host)
return []
except dns.exception.Timeout:
log.debug("DNS: A record resolution timed out for %s." % host)
log.debug("DNS: A record resolution timed out for %s" % host)
return []
except dns.exception.DNSException as e:
log.debug("DNS: Error querying A records for %s." % host)
log.debug("DNS: Error querying A records for %s" % host)
log.exception(e)
return []
@ -204,13 +216,13 @@ def get_AAAA(host, resolver=None):
recs = resolver.query(host, dns.rdatatype.AAAA)
return [rec.to_text() for rec in recs]
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
log.debug("DNS: No AAAA records for %s." % host)
log.debug("DNS: No AAAA records for %s" % host)
return []
except dns.exception.Timeout:
log.debug("DNS: AAAA record resolution timed out for %s." % host)
log.debug("DNS: AAAA record resolution timed out for %s" % host)
return []
except dns.exception.DNSException as e:
log.debug("DNS: Error querying AAAA records for %s." % host)
log.debug("DNS: Error querying AAAA records for %s" % host)
log.exception(e)
return []
@ -244,7 +256,7 @@ def get_SRV(host, port, service, proto='tcp', resolver=None):
if resolver is None:
return [(host, port)]
log.debug("Querying SRV records for %s" % host)
log.debug("DNS: Querying SRV records for %s" % host)
try:
recs = resolver.query('_%s._%s.%s' % (service, proto, host),
dns.rdatatype.SRV)

3
sleekxmpp/xmlstream/xmlstream.py
View file

@ -1018,7 +1018,8 @@ class XMLStream(object):
self.configure_dns(resolver, domain=domain, port=port)
return resolve(domain, port, service=self.dns_service,
resolver=resolver)
resolver=resolver,
use_ipv6=self.use_ipv6)
def pick_dns_answer(self, domain, port=None):
"""Pick a server and port from DNS answers.