Initial s2s stuff

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index f2542ed2783c27178fc55eb6ca69e9a308c5a599..d140ebe05e80b40af9779c73a31d8ccf41d91dc2 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -1,28 +1,57 @@
 
 local tonumber, tostring = tonumber, tostring;
-local ipairs = ipairs;
-
-local m_random = math.random;
-local format = string.format;
-
-local print = print;
+local ipairs, pairs, print, next= ipairs, pairs, print, next;
+local collectgarbage = collectgarbage;
+local m_random = import("math", "random");
+local format = import("string", "format");
 
 local hosts = hosts;
+local sessions = sessions;
 
 local modulemanager = require "core.modulemanager";
 local log = require "util.logger".init("sessionmanager");
 local error = error;
 local uuid_generate = require "util.uuid".uuid_generate;
+local rm_load_roster = require "core.rostermanager".load_roster;
+
+local newproxy = newproxy;
+local getmetatable = getmetatable;
+
 module "sessionmanager"
 
+local open_sessions = 0;
+
 function new_session(conn)
-       local session = { conn = conn, notopen = true, priority = 0, type = "c2s_unauthed" };
+       local session = { conn = conn,  priority = 0, type = "c2s_unauthed" };
+       if true then
+               session.trace = newproxy(true);
+               getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("Session got collected, now "..open_sessions.." sessions are allocated") end;
+       end
+       open_sessions = open_sessions + 1;
        local w = conn.write;
        session.send = function (t) w(tostring(t)); end
        return session;
 end
 
 function destroy_session(session)
+       session.log("info", "Destroying session");
+       if session.username then
+               if session.resource then
+                       hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
+               end
+               
+               if not next(hosts[session.host].sessions[session.username].sessions) then
+                       log("debug", "All resources of %s are now offline", session.username);
+                       hosts[session.host].sessions[session.username] = nil;
+               end
+       end
+       session.conn = nil;
+       session.disconnect = nil;
+       for k in pairs(session) do
+               if k ~= "trace" then
+                       session[k] = nil;
+               end
+       end
 end
 
 function send_to_session(session, data)
@@ -32,10 +61,10 @@ end
 
 function make_authenticated(session, username)
        session.username = username;
-       session.resource = resource;
        if session.type == "c2s_unauthed" then
                session.type = "c2s";
        end
+       return true;
 end
 
 function bind_resource(session, resource)
@@ -49,7 +78,7 @@ function bind_resource(session, resource)
        else
                if hosts[session.host].sessions[session.username].sessions[resource] then
                        -- Resource conflict
-                       return false, "conflict";
+                       return false, "conflict"; -- TODO kick old resource
                end
        end
        
@@ -57,6 +86,8 @@ function bind_resource(session, resource)
        session.full_jid = session.username .. '@' .. session.host .. '/' .. resource;
        hosts[session.host].sessions[session.username].sessions[resource] = session;
        
+       session.roster = rm_load_roster(session.username, session.host);
+       
        return true;
 end
 
@@ -79,7 +110,7 @@ function streamopened(session, attr)
                                                end
  
                                                send("</stream:features>");
-                                               log("info", "core", "Stream opened successfully");
+                                               log("info", "Stream opened successfully");
                                                session.notopen = nil;
 end