aboutsummaryrefslogtreecommitdiffstats
path: root/core
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
commitfee6a443f9fd43ea4bbbb6f0e52cd39ec1974189 (patch)
tree3c1fd2632aacd0e202a98ae377acf20b7dff3cc5 /core
parenta76e149c1ccbaa797e59754a39382d375a6a5070 (diff)
downloadprosody-fee6a443f9fd43ea4bbbb6f0e52cd39ec1974189.tar.gz
prosody-fee6a443f9fd43ea4bbbb6f0e52cd39ec1974189.zip
sessionmanager, s2smanager: Fix for syntax of null_data_handler() (thanks Nolan)
Diffstat (limited to 'core')
-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 f2e95429..602d6837 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -508,7 +508,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, reason)
(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 1d16b850..29adcfbb 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)");