prosody
f2d695d2e31e
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 @ 4518:f2d695d2e31e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 09 Mar 2012 18:46:19 +0000
parent 4512:eb97612bf42b
parent 4513:23b540ab346a
child 4684:dc70c4ffb66d
comparison
equal deleted inserted replaced
4512:eb97612bf42b 4518:f2d695d2e31e
547 -- Send a reply stream header 547 -- Send a reply stream header
548 session.to_host = attr.to and nameprep(attr.to); 548 session.to_host = attr.to and nameprep(attr.to);
549 session.from_host = attr.from and nameprep(attr.from); 549 session.from_host = attr.from and nameprep(attr.from);
550 550
551 session.streamid = uuid_gen(); 551 session.streamid = uuid_gen();
552 (session.log or log)("debug", "Incoming s2s received <stream:stream>"); 552 (session.log or log)("debug", "Incoming s2s received %s", st.stanza("stream:stream", attr):top_tag());
553 if session.to_host then 553 if session.to_host then
554 if not hosts[session.to_host] then 554 if not hosts[session.to_host] then
555 -- Attempting to connect to a host we don't serve 555 -- Attempting to connect to a host we don't serve
556 session:close({ 556 session:close({
557 condition = "host-unknown"; 557 condition = "host-unknown";