mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

sessionmanager, mod_c2s: Move timeout logic to mod_c2s

Browse source
This commit is contained in:
Matthew Wild 2012-01-23 00:56:57 +00:00
parent 73ab6ec287
commit b14f0af41d
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/sessionmanager.lua
View file

@ -28,8 +28,6 @@ local gettime = require "socket".gettime;
local st = require "util.stanza"; local st = require "util.stanza";
local c2s_timeout = config_get("*", "core", "c2s_timeout");
local newproxy = newproxy; local newproxy = newproxy;
local getmetatable = getmetatable; local getmetatable = getmetatable;
@ -62,14 +60,6 @@ function new_session(conn)
session.ip = conn:ip(); session.ip = conn:ip();
local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$"); local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
session.log = logger.init(conn_name); session.log = logger.init(conn_name);
if c2s_timeout then
add_task(c2s_timeout, function ()
if session.type == "c2s_unauthed" then
session:close("connection-timeout");
end
end);
end
return session; return session;
end end

11
plugins/mod_c2s.lua
View file

@ -8,6 +8,7 @@
module:set_global(); module:set_global();
local add_task = require "util.timer".add_task;
local new_xmpp_stream = require "util.xmppstream".new; local new_xmpp_stream = require "util.xmppstream".new;
local nameprep = require "util.encodings".stringprep.nameprep; local nameprep = require "util.encodings".stringprep.nameprep;
local portmanager = require "core.portmanager"; local portmanager = require "core.portmanager";
@ -24,6 +25,7 @@ local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
local log = module._log; local log = module._log;
local c2s_timeout = module:get_option_number("c2s_timeout");
local opt_keepalives = module:get_option_boolean("tcp_keepalives", false); local opt_keepalives = module:get_option_boolean("tcp_keepalives", false);
local sessions = module:shared("sessions"); local sessions = module:shared("sessions");
@ -186,6 +188,15 @@ function listener.onconnect(conn)
end end
end end
if c2s_timeout then
add_task(c2s_timeout, function ()
if session.type == "c2s_unauthed" then
session:close("connection-timeout");
end
end);
end
session.dispatch_stanza = stream_callbacks.handlestanza; session.dispatch_stanza = stream_callbacks.handlestanza;
end end