Merge presence/subscription support from waqas

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 3a5625cb498940f035abe06b1b44e12dfb6c75d5..82a001c1107d090e6d29aa9dd93f6c22a9a5e897 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -1,6 +1,6 @@
 
 local tonumber, tostring = tonumber, tostring;
-local ipairs, pairs, print= ipairs, pairs, print;
+local ipairs, pairs, print, next= ipairs, pairs, print, next;
 local collectgarbage = collectgarbage;
 local m_random = import("math", "random");
 local format = import("string", "format");
@@ -11,39 +11,39 @@ 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_getroster = require "core.rostermanager".getroster
+local uuid_generate = require "util.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,  priority = 0, type = "c2s_unauthed" };
        if true then
                session.trace = newproxy(true);
-               getmetatable(session.trace).__gc = function () print("Session got collected") end;
+               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)
-       if not (session and session.disconnect) then return; end 
-       log("debug", "Destroying session...");
-       session.disconnect();
-       if session.username then
+       (session.log or log)("info", "Destroying session");
+       if session.host and session.username then
                if session.resource then
                        hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
                end
-               local nomore = true;
-               for res, ssn in pairs(hosts[session.host].sessions[session.username]) do
-                       nomore = false;
-               end
-               if nomore then
-                       hosts[session.host].sessions[session.username] = nil;
+               if hosts[session.host] and hosts[session.host].sessions[session.username] then
+                       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
        end
        session.conn = nil;
@@ -53,11 +53,6 @@ function destroy_session(session)
                        session[k] = nil;
                end
        end
-       collectgarbage("collect");
-       collectgarbage("collect");
-       collectgarbage("collect");
-       collectgarbage("collect");
-       collectgarbage("collect");
 end
 
 function send_to_session(session, data)
@@ -84,7 +79,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
        
@@ -92,7 +87,7 @@ 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_getroster(session.username, session.host);
+       session.roster = rm_load_roster(session.username, session.host);
        
        return true;
 end
@@ -120,4 +115,24 @@ function streamopened(session, attr)
                                                session.notopen = nil;
 end
 
+function send_to_available_resources(user, host, stanza)
+       local count = 0;
+       local to = stanza.attr.to;
+       stanza.attr.to = nil;
+       local h = hosts[host];
+       if h and h.type == "local" then
+               local u = h.sessions[user];
+               if u then
+                       for k, session in pairs(u.sessions) do
+                               if session.presence then
+                                       session.send(stanza);
+                                       count = count + 1;
+                               end
+                       end
+               end
+       end
+       stanza.attr.to = to;
+       return count;
+end
+
 return _M;
\ No newline at end of file