Comparison

net.dns: resolver:query(): Handle getsocket() failures, and return true on success

comparison

equal deleted inserted replaced

-:6e22b0cf3d72
+:a096700d23d9
 	if co then
 		set(self.wanted, qclass, qtype, qname, co, true);
 		--set(self.yielded, co, qclass, qtype, qname, true);
 	end
-	local conn = self:getsocket(o.server)
+	local conn, err = self:getsocket(o.server)
+	if not conn then
+		return nil, err;
+	end
 	conn:send (o.packet)
 	if timer and self.timeout then
 		local num_servers = #self.server;
 		local i = 1;
 			if get(self.wanted, qclass, qtype, qname, co) then
 				if i < num_servers then
 					i = i + 1;
 					self:servfail(conn);
 					o.server = self.best_server;
-					conn = self:getsocket(o.server);
+					conn, err = self:getsocket(o.server);
-					conn:send(o.packet);
+					if conn then
-					return self.timeout;
+						conn:send(o.packet);
-				else
+						return self.timeout;
-					-- Tried everything, failed
+					end
-					self:cancel(qclass, qtype, qname, co, true);
 				end
+				-- Tried everything, failed
+				self:cancel(qclass, qtype, qname, co, true);
 			end
 		end)
 	end
+	return true;
 end
 function resolver:servfail(sock)
 	-- Resend all queries for this server