Mercurial > prosody-hg

diff net/xmppclient_listener.lua @ 3332:c941d1191709

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
xmpp{client,server}_listener: Put stanzas/in filtering code in the correct place to make it actually work :)
author Matthew Wild <mwild1@gmail.com>
date Thu, 08 Jul 2010 14:28:42 +0100
parents 9e16012c2155
children 8520cd88b84c
line wrap: on
line diff
--- a/net/xmppclient_listener.lua	Thu Jul 08 14:08:27 2010 +0100
+++ b/net/xmppclient_listener.lua	Thu Jul 08 14:28:42 2010 +0100
@@ -63,8 +63,11 @@
 end
 
 local function handleerr(err) log("error", "Traceback[c2s]: %s: %s", tostring(err), debug.traceback()); end
-function stream_callbacks.handlestanza(a, b)
-	xpcall(function () core_process_stanza(a, b) end, handleerr);
+function stream_callbacks.handlestanza(session, stanza)
+	stanza = session.filter("stanzas/in", stanza);
+	if stanza then
+		xpcall(function () core_process_stanza(session, stanza) end, handleerr);
+	end
 end
 
 local sessions = {};
@@ -151,10 +154,7 @@
 	
 	local handlestanza = stream_callbacks.handlestanza;
 	function session.dispatch_stanza(session, stanza)
-		stanza = filter("stanzas/in", stanza);
-		if stanza then
-			return handlestanza(session, stanza);
-		end
+		return handlestanza(session, stanza);
 	end
 end