prosody
ab338242e0da
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 @ 5106:ab338242e0da

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 26 Aug 2012 23:57:12 +0100
parent 5105:50688a2856f7
child 5306:10bc0e2aa55e
comparison
equal deleted inserted replaced
5104:27b45d2c19fe 5106:ab338242e0da
94 prosody.events.fire_event("s2sout-established", event_data); 94 prosody.events.fire_event("s2sout-established", event_data);
95 hosts[from].events.fire_event("s2sout-established", event_data); 95 hosts[from].events.fire_event("s2sout-established", event_data);
96 else 96 else
97 local host_session = hosts[to]; 97 local host_session = hosts[to];
98 session.send = function(stanza) 98 session.send = function(stanza)
99 host_session.events.fire_event("route/remote", { from_host = to, to_host = from, stanza = stanza }); 99 return host_session.events.fire_event("route/remote", { from_host = to, to_host = from, stanza = stanza });
100 end; 100 end;
101 101
102 prosody.events.fire_event("s2sin-established", event_data); 102 prosody.events.fire_event("s2sin-established", event_data);
103 hosts[to].events.fire_event("s2sin-established", event_data); 103 hosts[to].events.fire_event("s2sin-established", event_data);
104 end 104 end