diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-02-24 16:23:46 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-02-24 16:23:46 +0000 |
| commit | b26626109f7bbe808303787f619b67cb64792269 (patch) | |
| tree | de23e9acf420ce5ae271837be41e71f46350c79c /core | |
| parent | ddef415e167351b9197a06bfd1d401e70dd37e13 (diff) | |
| parent | 0f9c104f0cb7f20a63bf6f890d0d04a690418a1d (diff) | |
| download | prosody-b26626109f7bbe808303787f619b67cb64792269.tar.gz prosody-b26626109f7bbe808303787f619b67cb64792269.zip | |
Merge Zash with Florob and Maranda
Diffstat (limited to 'core')
| -rw-r--r-- | core/modulemanager.lua | 2 | ||||
| -rw-r--r-- | core/s2smanager.lua | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index a192e637..0ca37105 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -34,7 +34,7 @@ end local array, set = require "util.array", require "util.set"; -local autoload_modules = {"presence", "message", "iq", "offline"}; +local autoload_modules = {"presence", "message", "iq", "offline", "c2s", "s2s"}; local component_inheritable_modules = {"tls", "dialback", "iq"}; -- We need this to let modules access the real global namespace diff --git a/core/s2smanager.lua b/core/s2smanager.lua index e61aaccb..6877ee18 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -114,10 +114,7 @@ function mark_connected(session) local from, to = session.from_host, session.to_host; session.log("info", session.direction.." s2s connection "..from.."->"..to.." complete"); - - local send_to_host = send_to_host; - function session.send(data) return send_to_host(to, from, data); end - + local event_data = { session = session }; if session.type == "s2sout" then prosody.events.fire_event("s2sout-established", event_data); |