mod_component: Remove unused variable

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index d36591bfb34c2218c01c84388796409dbda57a88..c101bf4e5e3cc4c4442eb5c7d6780177874b394e 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -6,26 +6,21 @@
 -- COPYING file in the source package for more information.
 --
 
-
-
 local tonumber, tostring, setmetatable = tonumber, tostring, setmetatable;
 local ipairs, pairs, print, next= ipairs, pairs, print, next;
-local format = import("string", "format");
 
 local hosts = hosts;
 local full_sessions = full_sessions;
 local bare_sessions = bare_sessions;
 
-local modulemanager = require "core.modulemanager";
 local logger = require "util.logger";
 local log = logger.init("sessionmanager");
 local error = error;
-local uuid_generate = require "util.uuid".generate;
 local rm_load_roster = require "core.rostermanager".load_roster;
 local config_get = require "core.configmanager".get;
-local nameprep = require "util.encodings".stringprep.nameprep;
 local resourceprep = require "util.encodings".stringprep.resourceprep;
 local nodeprep = require "util.encodings".stringprep.nodeprep;
+local uuid_generate = require "util.uuid".generate;
 
 local initialize_filters = require "util.filters".initialize;
 local fire_event = prosody.events.fire_event;
@@ -34,8 +29,6 @@ local gettime = require "socket".gettime;
 
 local st = require "util.stanza";
 
-local c2s_timeout = config_get("*", "core", "c2s_timeout");
-
 local newproxy = newproxy;
 local getmetatable = getmetatable;
 
@@ -68,14 +61,6 @@ function new_session(conn)
        session.ip = conn:ip();
        local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
        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;
 end
@@ -103,21 +88,28 @@ function retire_session(session)
 end
 
 function destroy_session(session, err)
-       (session.log or log)("info", "Destroying session for %s (%s@%s)", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)");
+       (session.log or log)("info", "Destroying session for %s (%s@%s)%s", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)", err and (": "..err) or "");
        if session.destroyed then return; end
        
        -- Remove session/resource from user's session list
        if session.full_jid then
-               hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
+               local host_session = hosts[session.host];
+               
+               -- Allow plugins to prevent session destruction
+               if host_session.events.fire_event("pre-resource-unbind", {session=session, error=err}) then
+                       return;
+               end
+               
+               host_session.sessions[session.username].sessions[session.resource] = nil;
                full_sessions[session.full_jid] = nil;
                
-               if not next(hosts[session.host].sessions[session.username].sessions) then
+               if not next(host_session.sessions[session.username].sessions) then
                        log("debug", "All resources of %s are now offline", session.username);
-                       hosts[session.host].sessions[session.username] = nil;
+                       host_session.sessions[session.username] = nil;
                        bare_sessions[session.username..'@'..session.host] = nil;
                end
 
-               hosts[session.host].events.fire_event("resource-unbind", {session=session, error=err});
+               host_session.events.fire_event("resource-unbind", {session=session, error=err});
        end
        
        retire_session(session);
@@ -210,50 +202,6 @@ function bind_resource(session, resource)
        return true;
 end
 
-function streamopened(session, attr)
-       local send = session.send;
-       session.host = attr.to;
-       if not session.host then
-               session:close{ condition = "improper-addressing",
-                       text = "A 'to' attribute is required on stream headers" };
-               return;
-       end
-       session.host = nameprep(session.host);
-       session.version = tonumber(attr.version) or 0;
-       session.streamid = uuid_generate();
-       (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host);
-
-       if not hosts[session.host] then
-               -- We don't serve this host...
-               session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)};
-               return;
-       end
-
-       send("<?xml version='1.0'?>");
-       send(format("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s' version='1.0' xml:lang='en'>", session.streamid, session.host));
-
-       (session.log or log)("debug", "Sent reply <stream:stream> to client");
-       session.notopen = nil;
-
-       -- If session.secure is *false* (not nil) then it means we /were/ encrypting
-       -- since we now have a new stream header, session is secured
-       if session.secure == false then
-               session.secure = true;
-       end
-
-       local features = st.stanza("stream:features");
-       hosts[session.host].events.fire_event("stream-features", { origin = session, features = features });
-       fire_event("stream-features", session, features);
-
-       send(features);
-
-end
-
-function streamclosed(session)
-       session.log("debug", "Received </stream:stream>");
-       session:close();
-end
-
 function send_to_available_resources(user, host, stanza)
        local jid = user.."@"..host;
        local count = 0;