Skip to content

Commit

Permalink
[Greendns] Replace deprecated resolver.query by resolver.resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
4383 committed Dec 18, 2023
1 parent d78f8f6 commit 7243eeb
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions eventlet/support/greendns.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,8 @@ def end():
return end()

# Main query
step(self._resolver.query, qname, rdtype, rdclass, tcp, source, raise_on_no_answer=False)
step(self._resolver.resolve, qname, rdtype, rdclass, tcp, source,
raise_on_no_answer=False, search=True)

# `resolv.conf` docs say unqualified names must resolve from search (or local) domain.
# However, common OS `getaddrinfo()` implementations append trailing dot (e.g. `db -> db.`)
Expand All @@ -409,8 +410,9 @@ def end():
# https://github.com/nameko/nameko/issues/392
# https://github.com/eventlet/eventlet/issues/363
if len(qname) == 1:
step(self._resolver.query, qname.concatenate(dns.name.root),
rdtype, rdclass, tcp, source, raise_on_no_answer=False)
step(self._resolver.resolve, qname.concatenate(dns.name.root),
rdtype, rdclass, tcp, source, raise_on_no_answer=False,
search=True)

return end()

Expand Down Expand Up @@ -623,8 +625,9 @@ def getnameinfo(sockaddr, flags):

if is_ipv4_addr(host):
try:
rrset = resolver.query(
dns.reversename.from_address(host), dns.rdatatype.PTR)
rrset = resolver.resolve(
dns.reversename.from_address(host), dns.rdatatype.PTR,
search=True)
if len(rrset) > 1:
raise socket.error('sockaddr resolved to multiple addresses')
host = rrset[0].target.to_text(omit_final_dot=True)
Expand All @@ -636,7 +639,7 @@ def getnameinfo(sockaddr, flags):
raise EAI_NONAME_ERROR
else:
try:
rrset = resolver.query(host)
rrset = resolver.resolve(host, search=True)
if len(rrset) > 1:
raise socket.error('sockaddr resolved to multiple addresses')
if flags & socket.NI_NUMERICHOST:
Expand Down

0 comments on commit 7243eeb

Please sign in to comment.