X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_bosh.lua;h=99451754b621b58e59b464d0c1a2b2d965b45cdd;hb=7aac63ce269ab910f5f36fe196e8ea7656767476;hp=fd33226cccede8ea51786249791281b21af912d3;hpb=1fd4988df04d0b2735c7ffce8fdd96b75929598e;p=prosody.git diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index fd33226c..99451754 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -13,7 +13,6 @@ local new_xmpp_stream = require "util.xmppstream".new; local sm = require "core.sessionmanager"; local sm_destroy_session = sm.destroy_session; local new_uuid = require "util.uuid".generate; -local fire_event = prosody.events.fire_event; local core_process_stanza = prosody.core_process_stanza; local st = require "util.stanza"; local logger = require "util.logger"; @@ -22,7 +21,6 @@ local initialize_filters = require "util.filters".initialize; local math_min = math.min; local xpcall, tostring, type = xpcall, tostring, type; local traceback = debug.traceback; -local runner = require"util.async".runner; local xmlns_streams = "http://etherx.jabber.org/streams"; local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams"; @@ -229,8 +227,6 @@ local function bosh_close_stream(session, reason) sm_destroy_session(session); end -local runner_callbacks = { }; - -- Handle the tag in the request payload. function stream_callbacks.streamopened(context, attr) local request, response = context.request, context.response; @@ -263,10 +259,6 @@ function stream_callbacks.streamopened(context, attr) }; sessions[sid] = session; - session.thread = runner(function (stanza) - session:dispatch_stanza(stanza); - end, runner_callbacks, session); - local filter = initialize_filters(session); session.log("debug", "BOSH session created for request from %s", session.ip); @@ -286,6 +278,7 @@ function stream_callbacks.streamopened(context, attr) end s = filter("stanzas/out", s); --log("debug", "Sending BOSH data: %s", tostring(s)); + if not s then return true end t_insert(session.send_buffer, tostring(s)); local oldest_request = r[1]; @@ -364,11 +357,6 @@ function stream_callbacks.streamopened(context, attr) end local function handleerr(err) log("error", "Traceback[bosh]: %s", traceback(tostring(err), 2)); end - -function runner_callbacks:error(err) - return handleerr(err); -end - function stream_callbacks.handlestanza(context, stanza) if context.ignore then return; end log("debug", "BOSH stanza received: %s\n", stanza:top_tag()); @@ -378,7 +366,9 @@ function stream_callbacks.handlestanza(context, stanza) stanza.attr.xmlns = nil; end stanza = session.filter("stanzas/in", stanza); - session.thread:run(stanza); + if stanza then + return xpcall(function () return core_process_stanza(session, stanza) end, handleerr); + end end end