aboutsummaryrefslogtreecommitdiffstats
path: root/core/s2smanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-02-24 16:23:46 +0000
committerMatthew Wild <mwild1@gmail.com>2012-02-24 16:23:46 +0000
commitb26626109f7bbe808303787f619b67cb64792269 (patch)
treede23e9acf420ce5ae271837be41e71f46350c79c /core/s2smanager.lua
parentddef415e167351b9197a06bfd1d401e70dd37e13 (diff)
parent0f9c104f0cb7f20a63bf6f890d0d04a690418a1d (diff)
downloadprosody-b26626109f7bbe808303787f619b67cb64792269.tar.gz
prosody-b26626109f7bbe808303787f619b67cb64792269.zip
Merge Zash with Florob and Maranda
Diffstat (limited to 'core/s2smanager.lua')
-rw-r--r--core/s2smanager.lua5
1 files changed, 1 insertions, 4 deletions
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);