prosody
0e81e3dab896
plugins/mod_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/mod_s2s/mod_s2s.lua @ 6905:0e81e3dab896

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 11 Oct 2015 20:03:00 +0200
parent 6861:39789f1669cb
parent 6901:ccc452767ec6
child 7102:250016f5eb7e
comparison
equal deleted inserted replaced
6892:214a62915368 6905:0e81e3dab896
350 350
351 if to then 351 if to then
352 hosts[to].events.fire_event("s2s-stream-features", { origin = session, features = features }); 352 hosts[to].events.fire_event("s2s-stream-features", { origin = session, features = features });
353 else 353 else
354 (session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", from or session.ip or "unknown host"); 354 (session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", from or session.ip or "unknown host");
355 fire_global_event("s2s-stream-features-legacy", { origin = session, features = features });
355 end 356 end
356 357
357 if ( session.type == "s2sin" or session.type == "s2sout" ) or features.tags[1] then 358 if ( session.type == "s2sin" or session.type == "s2sout" ) or features.tags[1] then
358 log("debug", "Sending stream features: %s", tostring(features)); 359 log("debug", "Sending stream features: %s", tostring(features));
359 session.sends2s(features); 360 session.sends2s(features);