Merge presence/subscription support from waqas

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index b012ac6cf6a4f842fce74903ee824a2060dbdf82..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,7 +11,7 @@ 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 uuid_generate = require "util.uuid".generate;
 local rm_load_roster = require "core.rostermanager".load_roster;
 
 local newproxy = newproxy;
@@ -34,17 +34,16 @@ function new_session(conn)
 end
 
 function destroy_session(session)
-       session.log("info", "Destroying session");
-       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;
@@ -116,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