prosody
75b3d0c301d0
plugins/s2s/mod_s2s.lua

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

Software / code / prosody

Comparison

plugins/s2s/mod_s2s.lua @ 4591:75b3d0c301d0

Merge with Zash
author Matthew Wild <mwild1@gmail.com>
date Wed, 07 Mar 2012 20:11:01 +0000
parent 4589:8553d822f417
parent 4590:883611842d3a
child 4593:470f502f02a3
comparison
equal deleted inserted replaced
4589:8553d822f417 4591:75b3d0c301d0
194 session:close({ condition = "improper-addressing", text = "New stream 'to' attribute does not match original" }); 194 session:close({ condition = "improper-addressing", text = "New stream 'to' attribute does not match original" });
195 return; 195 return;
196 end 196 end
197 197
198 session.streamid = uuid_gen(); 198 session.streamid = uuid_gen();
199 (session.log or log)("debug", "Incoming s2s received <stream:stream>"); 199 (session.log or log)("debug", "Incoming s2s received %s", st.stanza("stream:stream", attr):top_tag());
200 if session.to_host then 200 if session.to_host then
201 if not hosts[session.to_host] then 201 if not hosts[session.to_host] then
202 -- Attempting to connect to a host we don't serve 202 -- Attempting to connect to a host we don't serve
203 session:close({ 203 session:close({
204 condition = "host-unknown"; 204 condition = "host-unknown";