diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2014-12-16 18:33:54 -0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2014-12-16 18:33:54 -0500 |
| commit | 6db8f941f1437a02b380710df0e22e2a5e76568d (patch) | |
| tree | dcafd2057d83c1a967fe5381adba1478d7e22001 /plugins/mod_bosh.lua | |
| parent | ac568342e55017173a1751565ba4ab18f7f0e11e (diff) | |
| parent | 7aa032e7652834c2feac726ed1276c941e1dfb3f (diff) | |
| download | prosody-6db8f941f1437a02b380710df0e22e2a5e76568d.tar.gz prosody-6db8f941f1437a02b380710df0e22e2a5e76568d.zip | |
Merge 0.10 -> trunk
Diffstat (limited to 'plugins/mod_bosh.lua')
| -rw-r--r-- | plugins/mod_bosh.lua | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index ca67db73..9e8354fe 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -22,6 +22,7 @@ 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"; @@ -228,6 +229,8 @@ local function bosh_close_stream(session, reason) sm_destroy_session(session); end +local runner_callbacks = { }; + -- Handle the <body> tag in the request payload. function stream_callbacks.streamopened(context, attr) local request, response = context.request, context.response; @@ -260,6 +263,10 @@ 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); @@ -355,6 +362,11 @@ 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()); @@ -364,9 +376,7 @@ function stream_callbacks.handlestanza(context, stanza) stanza.attr.xmlns = nil; end stanza = session.filter("stanzas/in", stanza); - if stanza then - return xpcall(function () return core_process_stanza(session, stanza) end, handleerr); - end + session.thread:run(stanza); end end |