[ruby/resolv] Reuse open TCP connection

[RFC7766] Section 5 recommends stub resolvers to reuse open TCP
connections to a nameserver.

[RFC7766]: https://datatracker.ietf.org/doc/html/rfc7766

https://github.com/ruby/resolv/commit/9bf1b08f5c
This commit is contained in:
Kasumi Hanazuki 2024-06-01 10:07:46 +00:00 коммит произвёл git
Родитель 4be9b72fbb
Коммит 094e53360d
1 изменённых файлов: 15 добавлений и 14 удалений

Просмотреть файл

@ -513,27 +513,28 @@ class Resolv
def fetch_resource(name, typeclass) def fetch_resource(name, typeclass)
lazy_initialize lazy_initialize
protocols = {} truncated = {}
requesters = {} requesters = {}
udp_requester = begin
make_udp_requester
rescue Errno::EACCES
# fall back to TCP
end
senders = {} senders = {}
begin begin
@config.resolv(name) do |candidate, tout, nameserver, port| @config.resolv(name) do |candidate, tout, nameserver, port|
msg = Message.new msg = Message.new
msg.rd = 1 msg.rd = 1
msg.add_question(candidate, typeclass) msg.add_question(candidate, typeclass)
protocol = protocols[candidate] ||= :udp requester = requesters.fetch([nameserver, port]) do
requester = requesters[[protocol, nameserver]] ||= if !truncated[candidate] && udp_requester
case protocol udp_requester
when :udp else
begin requesters[[nameserver, port]] = make_tcp_requester(nameserver, port)
make_udp_requester
rescue Errno::EACCES
make_tcp_requester(nameserver, port)
end
when :tcp
make_tcp_requester(nameserver, port)
end end
end
unless sender = senders[[candidate, requester, nameserver, port]] unless sender = senders[[candidate, requester, nameserver, port]]
sender = requester.sender(msg, candidate, nameserver, port) sender = requester.sender(msg, candidate, nameserver, port)
@ -544,9 +545,8 @@ class Resolv
case reply.rcode case reply.rcode
when RCode::NoError when RCode::NoError
if reply.tc == 1 and not Requester::TCP === requester if reply.tc == 1 and not Requester::TCP === requester
requester.close
# Retry via TCP: # Retry via TCP:
protocols[candidate] = :tcp truncated[candidate] = true
redo redo
else else
yield(reply, reply_name) yield(reply, reply_name)
@ -559,6 +559,7 @@ class Resolv
end end
end end
ensure ensure
udp_requester&.close
requesters.each_value { |requester| requester&.close } requesters.each_value { |requester| requester&.close }
end end
end end