mod_presence: Don't depend on sessions array existing for a user when handling outgoi...

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 7e609f22055b33f94fde119081613f99e19ae757..df144f07bacfd6365b1f82c97b171ffc9dd94570 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -10,7 +10,6 @@
 
 local tonumber, tostring = tonumber, tostring;
 local ipairs, pairs, print, next= ipairs, pairs, print, next;
-local collectgarbage = collectgarbage;
 local format = import("string", "format");
 
 local hosts = hosts;
@@ -25,6 +24,7 @@ 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 fire_event = require "core.eventmanager".fire_event;
 local add_task = require "util.timer".add_task;
@@ -50,8 +50,8 @@ function new_session(conn)
        open_sessions = open_sessions + 1;
        log("debug", "open sessions now: ".. open_sessions);
        local w = conn.write;
-       session.send = function (t) w(conn, tostring(t)); end
-       session.ip = conn:ip();
+       session.send = function (t) w(tostring(t)); end
+       session.ip = conn.ip();
        local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
        session.log = logger.init(conn_name);
        
@@ -106,7 +106,8 @@ function bind_resource(session, resource)
        if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end
        -- We don't support binding multiple resources
 
-       resource = resource or uuid_generate();
+       resource = resourceprep(resource);
+       resource = resource ~= "" and resource or uuid_generate();
        --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing
        
        if not hosts[session.host].sessions[session.username] then
@@ -201,22 +202,32 @@ function streamclosed(session)
 end
 
 function send_to_available_resources(user, host, stanza)
+       local jid = user.."@"..host;
        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
+       local user = bare_sessions[jid];
+       if user then
+               for k, session in pairs(user.sessions) do
+                       if session.presence then
+                               session.send(stanza);
+                               count = count + 1;
+                       end
+               end
+       end
+       return count;
+end
+
+function send_to_interested_resources(user, host, stanza)
+       local jid = user.."@"..host;
+       local count = 0;
+       local user = bare_sessions[jid];
+       if user then
+               for k, session in pairs(user.sessions) do
+                       if session.interested then
+                               session.send(stanza);
+                               count = count + 1;
                        end
                end
        end
-       stanza.attr.to = to;
        return count;
 end