aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-12 17:27:53 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-12 17:27:53 +0000
commit4a592b5069548aa13a6aad96a1fcb54222345290 (patch)
treeb47963e27bc6feeadcea46716ca21365cad9cfcb
parent2739ed3948b9df3a596d6aef6d6790f1c2e1c59f (diff)
downloadprosody-4a592b5069548aa13a6aad96a1fcb54222345290.tar.gz
prosody-4a592b5069548aa13a6aad96a1fcb54222345290.zip
sessionmanager, s2smanager: Fix for syntax of null_data_handler() (thanks Nolan)
-rw-r--r--core/s2smanager.lua2
-rw-r--r--core/sessionmanager.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 7de97d0c..e8d8e723 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -491,7 +491,7 @@ function mark_connected(session)
end
end
-local function null_data_handler(data) log("debug", "Discarding data from destroyed s2s session: %s", data); end
+local function null_data_handler(conn, data) log("debug", "Discarding data from destroyed s2s session: %s", data); end
function destroy_session(session)
(session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host));
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 9df7823c..2dd0070b 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -66,7 +66,7 @@ function new_session(conn)
return session;
end
-local function null_data_handler(data) log("debug", "Discarding data from destroyed c2s session: %s", data); end
+local function null_data_handler(conn, data) log("debug", "Discarding data from destroyed c2s session: %s", data); end
function destroy_session(session, err)
(session.log or log)("info", "Destroying session for %s (%s@%s)", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)");