From ec41e71baaad7d6be6da1447e7388bfe7857cc09 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 8 Jul 2010 14:28:42 +0100 Subject: xmpp{client,server}_listener: Put stanzas/in filtering code in the correct place to make it actually work :) --- net/xmppserver_listener.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'net/xmppserver_listener.lua') diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua index 8700e6f2..6989c202 100644 --- a/net/xmppserver_listener.lua +++ b/net/xmppserver_listener.lua @@ -49,11 +49,14 @@ function stream_callbacks.error(session, error, data) end local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end -function stream_callbacks.handlestanza(a, b) - if b.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client - b.attr.xmlns = nil; +function stream_callbacks.handlestanza(session, stanza) + if stanza.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client + stanza.attr.xmlns = nil; + end + stanza = session.filter("stanzas/in", stanza); + if stanza then + xpcall(function () core_process_stanza(a, b) end, handleerr); end - xpcall(function () core_process_stanza(a, b) end, handleerr); end local connlisteners_register = require "net.connlisteners".register; @@ -140,10 +143,7 @@ local function initialize_session(session) session.close = session_close; local handlestanza = stream_callbacks.handlestanza; function session.dispatch_stanza(session, stanza) - stanza = filters("stanzas/in", stanza); - if stanza then - return handlestanza(session, stanza); - end + return handlestanza(session, stanza); end end -- cgit v1.2.3