projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.10->trunk
[prosody.git]
/
plugins
/
mod_c2s.lua
diff --git
a/plugins/mod_c2s.lua
b/plugins/mod_c2s.lua
index e69bf461d2e3637219339dbaacd40ea577668cc2..703c4ac7ab4054f49c3eb10683fe55acb62c2e36 100644
(file)
--- a/
plugins/mod_c2s.lua
+++ b/
plugins/mod_c2s.lua
@@
-15,9
+15,10
@@
local sessionmanager = require "core.sessionmanager";
local st = require "util.stanza";
local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
local uuid_generate = require "util.uuid".generate;
local st = require "util.stanza";
local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
local uuid_generate = require "util.uuid".generate;
+local runner = require "util.async".runner;
local xpcall, tostring, type = xpcall, tostring, type;
local xpcall, tostring, type = xpcall, tostring, type;
-local t
raceback = debug.traceback
;
+local t
_insert, t_remove = table.insert, table.remove
;
local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
@@
-35,6
+36,7
@@
local hosts = prosody.hosts;
local stream_callbacks = { default_ns = "jabber:client" };
local listener = {};
local stream_callbacks = { default_ns = "jabber:client" };
local listener = {};
+local runner_callbacks = {};
do
-- Connection counter resets to 0 on load and reload
do
-- Connection counter resets to 0 on load and reload
@@
-131,12
+133,9
@@
function stream_callbacks.error(session, error, data)
end
end
end
end
-local function handleerr(err) log("error", "Traceback[c2s]: %s", traceback(tostring(err), 2)); end
function stream_callbacks.handlestanza(session, stanza)
stanza = session.filter("stanzas/in", stanza);
function stream_callbacks.handlestanza(session, stanza)
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
--- Session methods
end
--- Session methods
@@
-205,6
+204,18
@@
module:hook_global("user-deleted", function(event)
end
end, 200);
end
end, 200);
+function runner_callbacks:ready()
+ self.data.conn:resume();
+end
+
+function runner_callbacks:waiting()
+ self.data.conn:pause();
+end
+
+function runner_callbacks:error(err)
+ (self.data.log or log)("error", "Traceback[c2s]: %s", err);
+end
+
--- Port listener
function listener.onconnect(conn)
measure_connections(1);
--- Port listener
function listener.onconnect(conn)
measure_connections(1);
@@
-242,6
+253,10
@@
function listener.onconnect(conn)
session.stream:reset();
end
session.stream:reset();
end
+ session.thread = runner(function (stanza)
+ core_process_stanza(session, stanza);
+ end, runner_callbacks, session);
+
local filter = session.filter;
function session.data(data)
-- Parse the data, which will store stanzas in session.pending_stanzas
local filter = session.filter;
function session.data(data)
-- Parse the data, which will store stanzas in session.pending_stanzas