mod_s2s: Make sure host variable is reachable

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 17c718dca9fc841061912ed876381ec91c8b5328..05b2d64b918b12cd40d53908ff4f198fcc03b785 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -6,8 +6,8 @@
 -- 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 tostring, setmetatable = tostring, setmetatable;
+local pairs, next= pairs, next;
 
 local hosts = hosts;
 local full_sessions = full_sessions;
@@ -15,21 +15,15 @@ local bare_sessions = bare_sessions;
 
 local logger = require "util.logger";
 local log = logger.init("sessionmanager");
-local error = error;
 local rm_load_roster = require "core.rostermanager".load_roster;
 local config_get = require "core.configmanager".get;
 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;
-local add_task = require "util.timer".add_task;
 local gettime = require "socket".gettime;
 
-local st = require "util.stanza";
-
-local c2s_timeout = config_get("*", "core", "c2s_timeout");
-
 local newproxy = newproxy;
 local getmetatable = getmetatable;
 
@@ -44,7 +38,7 @@ function new_session(conn)
                getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end;
        end
        open_sessions = open_sessions + 1;
-       log("debug", "open sessions now: ".. open_sessions);
+       log("debug", "open sessions now: %d", open_sessions);
        
        local filter = initialize_filters(session);
        local w = conn.write;
@@ -60,16 +54,8 @@ function new_session(conn)
                end
        end
        session.ip = conn:ip();
-       local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
+       local conn_name = "c2s"..tostring(session):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
@@ -91,13 +77,13 @@ function retire_session(session)
                end
        end
 
-       function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); end
+       function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); return false; end
        function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end
        return setmetatable(session, resting_session);
 end
 
 function destroy_session(session, err)
-       (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 "");
+       (session.log or log)("debug", "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
@@ -152,10 +138,6 @@ function bind_resource(session, resource)
                bare_sessions[session.username..'@'..session.host] = sessions;
        else
                local sessions = hosts[session.host].sessions[session.username].sessions;
-               local limit = config_get(session.host, "core", "max_resources") or 10;
-               if #sessions >= limit then
-                       return nil, "cancel", "resource-constraint", "Resource limit reached; only "..limit.." resources allowed";
-               end
                if sessions[resource] then
                        -- Resource conflict
                        local policy = config_get(session.host, "core", "conflict_resolve");
@@ -203,6 +185,7 @@ function bind_resource(session, resource)
                        bare_sessions[session.username..'@'..session.host] = nil;
                        hosts[session.host].sessions[session.username] = nil;
                end
+               session.log("error", "Roster loading failed: %s", err);
                return nil, "cancel", "internal-server-error", "Error loading roster";
        end