prosody
c6091977624b
core/s2smanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/s2smanager.lua @ 3152:c6091977624b

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 03 Jun 2010 12:29:27 +0100
parent 3146:aaaea4cdbf10
parent 3151:6eca858feb04
child 3224:9dd54a708523
comparison
equal deleted inserted replaced
3150:0005df92d379 3152:c6091977624b
254 if handle then 254 if handle then
255 adns.cancel(handle, true); 255 adns.cancel(handle, true);
256 end 256 end
257 end); 257 end);
258 258
259 log("debug", "DNS lookup for %s sent, waiting for response before we can connect", to_host);
260 return true; -- Attempt in progress 259 return true; -- Attempt in progress
261 elseif host_session.srv_hosts and #host_session.srv_hosts > host_session.srv_choice then -- Not our first attempt, and we also have SRV 260 elseif host_session.srv_hosts and #host_session.srv_hosts > host_session.srv_choice then -- Not our first attempt, and we also have SRV
262 host_session.srv_choice = host_session.srv_choice + 1; 261 host_session.srv_choice = host_session.srv_choice + 1;
263 local srv_choice = host_session.srv_hosts[host_session.srv_choice]; 262 local srv_choice = host_session.srv_hosts[host_session.srv_choice];
264 connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port; 263 connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port;