prosody
fb01f0906564
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 @ 2166:fb01f0906564

Merge with 0.6
author Matthew Wild <mwild1@gmail.com>
date Wed, 25 Nov 2009 03:30:41 +0000
parent 2134:9044e7cfefc2
parent 2165:529af807ba1a
child 2231:288832cdec52
comparison
equal deleted inserted replaced
2164:339a96689dcb 2166:fb01f0906564
77 session.sendq = nil; 77 session.sendq = nil;
78 end 78 end
79 end 79 end
80 80
81 function send_to_host(from_host, to_host, data) 81 function send_to_host(from_host, to_host, data)
82 if not hosts[from_host] then
83 log("warn", "Attempt to send stanza from %s - a host we don't serve", from_host);
84 return false;
85 end
82 local host = hosts[from_host].s2sout[to_host]; 86 local host = hosts[from_host].s2sout[to_host];
83 if host then 87 if host then
84 -- We have a connection to this host already 88 -- We have a connection to this host already
85 if host.type == "s2sout_unauthed" and (data.name ~= "db:verify" or not host.dialback_key) and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then 89 if host.type == "s2sout_unauthed" and (data.name ~= "db:verify" or not host.dialback_key) and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then
86 (host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host); 90 (host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host);