Comparison

net.dns, net.adns: Update resolver:cancel() API so that a table doesn't need to be created for each cancellation internal to net.dns

comparison

equal deleted inserted replaced

-:b3117a1da834
+:fb95015bc646
 					conn = self:getsocket(o.server);
 					conn:send(o.packet);
 					return dns_timeout;
 				else
 					-- Tried everything, failed
-					resolver:cancel({qclass, qtype, qname, co}, true);
+					resolver:cancel(qclass, qtype, qname, co, true);
 				end
 			end
 		end)
 	end
 end
 	end
 	return response;
 end
-function resolver:cancel(data, call_handler)
+function resolver:cancel(qclass, qtype, qname, co, call_handler)
-	local cos = get(self.wanted, unpack(data, 1, 3));
+	local cos = get(self.wanted, qclass, qtype, qname);
 	if cos then
 		if call_handler then
-			coroutine.resume(data[4]);
+			coroutine.resume(co);
 		end
-		cos[data[4]] = nil;
+		cos[co] = nil;
 	end
 end
 function resolver:pulse()    -- - - - - - - - - - - - - - - - - - - - -  pulse
 	--print(':pulse');