projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.9->0.10
[prosody.git]
/
plugins
/
mod_c2s.lua
diff --git
a/plugins/mod_c2s.lua
b/plugins/mod_c2s.lua
index f0cdd7fb1044a71952d48597387d91f50bd98575..2829d5fdb61fe221d59f22d65d618abcf8c5ee68 100644
(file)
--- a/
plugins/mod_c2s.lua
+++ b/
plugins/mod_c2s.lua
@@
-15,10
+15,9
@@
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
_insert, t_remove = table.insert, table.remove
;
+local t
raceback = debug.traceback
;
local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
@@
-28,13
+27,14
@@
local c2s_timeout = module:get_option_number("c2s_timeout");
local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
+local measure_connections = module:measure("connections", "counter");
+
local sessions = module:shared("sessions");
local core_process_stanza = prosody.core_process_stanza;
local hosts = prosody.hosts;
local stream_callbacks = { default_ns = "jabber:client" };
local listener = {};
local sessions = module:shared("sessions");
local core_process_stanza = prosody.core_process_stanza;
local hosts = prosody.hosts;
local stream_callbacks = { default_ns = "jabber:client" };
local listener = {};
-local runner_callbacks = {};
--- Stream events handlers
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
--- Stream events handlers
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
@@
-81,7
+81,12
@@
function stream_callbacks.streamopened(session, attr)
local features = st.stanza("stream:features");
hosts[session.host].events.fire_event("stream-features", { origin = session, features = features });
local features = st.stanza("stream:features");
hosts[session.host].events.fire_event("stream-features", { origin = session, features = features });
- send(features);
+ if features.tags[1] or session.full_jid then
+ send(features);
+ else
+ (session.log or log)("warn", "No features to offer");
+ session:close{ condition = "undefined-condition", text = "No features to proceed with" };
+ end
end
function stream_callbacks.streamclosed(session)
end
function stream_callbacks.streamclosed(session)
@@
-91,7
+96,7
@@
end
function stream_callbacks.error(session, error, data)
if error == "no-stream" then
function stream_callbacks.error(session, error, data)
if error == "no-stream" then
- session.log("debug", "Invalid opening stream header
"
);
+ session.log("debug", "Invalid opening stream header
(%s)", (data:gsub("^([^\1]+)\1", "{%1}"))
);
session:close("invalid-namespace");
elseif error == "parse-error" then
(session.log or log)("debug", "Client XML parse error: %s", tostring(data));
session:close("invalid-namespace");
elseif error == "parse-error" then
(session.log or log)("debug", "Client XML parse error: %s", tostring(data));
@@
-116,9
+121,12
@@
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);
- session.thread:run(stanza);
+ if stanza then
+ return xpcall(function () return core_process_stanza(session, stanza) end, handleerr);
+ end
end
--- Session methods
end
--- Session methods
@@
-171,6
+179,9
@@
local function session_close(session, reason)
sm_destroy_session(session, reason);
conn:close();
end
sm_destroy_session(session, reason);
conn:close();
end
+ else
+ local reason = (reason and (reason.name or reason.text or reason.condition)) or reason;
+ sm_destroy_session(session, reason);
end
end
end
end
@@
-184,20
+195,9
@@
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)
--- Port listener
function listener.onconnect(conn)
+ measure_connections(1);
local session = sm_new_session(conn);
sessions[conn] = session;
local session = sm_new_session(conn);
sessions[conn] = session;
@@
-232,17
+232,13
@@
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
if data then
local filter = session.filter;
function session.data(data)
-- Parse the data, which will store stanzas in session.pending_stanzas
if data then
-
data = filter("bytes/in", data);
-
if data then
-
local ok, err = stream:feed(data);
+ data = filter("bytes/in", data);
+ if data then
+ local ok, err = stream:feed(data);
if not ok then
log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
session:close("not-well-formed");
if not ok then
log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
session:close("not-well-formed");
@@
-270,10
+266,12
@@
function listener.onincoming(conn, data)
end
function listener.ondisconnect(conn, err)
end
function listener.ondisconnect(conn, err)
+ measure_connections(-1);
local session = sessions[conn];
if session then
(session.log or log)("info", "Client disconnected: %s", err or "connection closed");
sm_destroy_session(session, err);
local session = sessions[conn];
if session then
(session.log or log)("info", "Client disconnected: %s", err or "connection closed");
sm_destroy_session(session, err);
+ session.conn = nil;
sessions[conn] = nil;
end
end
sessions[conn] = nil;
end
end
@@
-304,7
+302,7
@@
module:hook("server-stopping", function(event)
for _, session in pairs(sessions) do
session:close{ condition = "system-shutdown", text = reason };
end
for _, session in pairs(sessions) do
session:close{ condition = "system-shutdown", text = reason };
end
-end,
10
00);
+end,
-1
00);