Send host, and not the recipient's JID to module manager (fixes #53)

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 36111633418b9362e8d7db603afb43a1a763ea35..963de7ce01436e51e125a58c9f81598a1e71d7e1 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.1
+-- Prosody IM v0.2
 -- Copyright (C) 2008 Matthew Wild
 -- Copyright (C) 2008 Waqas Hussain
 -- 
@@ -35,6 +35,10 @@ local uuid_generate = require "util.uuid".generate;
 local rm_load_roster = require "core.rostermanager".load_roster;
 local config_get = require "core.configmanager".get;
 
+local fire_event = require "core.eventmanager".fire_event;
+
+local gettime = require "socket".gettime;
+
 local st = require "util.stanza";
 
 local newproxy = newproxy;
@@ -45,10 +49,10 @@ module "sessionmanager"
 local open_sessions = 0;
 
 function new_session(conn)
-       local session = { conn = conn,  priority = 0, type = "c2s_unauthed" };
+       local session = { conn = conn,  priority = 0, type = "c2s_unauthed", conntime = gettime() };
        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;
+               getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end;
        end
        open_sessions = open_sessions + 1;
        log("info", "open sessions now: ".. open_sessions);
@@ -65,7 +69,7 @@ function destroy_session(session, err)
                local pres = st.presence{ type = "unavailable" };
                if (not err) or err == "closed" then err = "connection closed"; end
                pres:tag("status"):text("Disconnected: "..err);
-               session.stanza_dispatch(pres);
+               session:dispatch_stanza(pres);
        end
        
        -- Remove session/resource from user's session list
@@ -175,7 +179,7 @@ function streamopened(session, attr)
                                                
                                                
                                                local features = st.stanza("stream:features");
-                                               modulemanager.fire_event("stream-features", session, features);
+                                               fire_event("stream-features", session, features);
                                                
                                                send(features);
                                                
@@ -203,4 +207,4 @@ function send_to_available_resources(user, host, stanza)
        return count;
 end
 
-return _M;
\ No newline at end of file
+return _M;