Merge with 0.5

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 19943db0bae65c7995a19e1000efa0eb64ee6930..59f0eadf8087910294dad2feb31b21d11641bb5c 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -19,7 +19,8 @@ local full_sessions = full_sessions;
 local bare_sessions = bare_sessions;
 
 local modulemanager = require "core.modulemanager";
-local log = require "util.logger".init("sessionmanager");
+local logger = require "util.logger";
+local log = logger.init("sessionmanager");
 local error = error;
 local uuid_generate = require "util.uuid".generate;
 local rm_load_roster = require "core.rostermanager".load_roster;
@@ -40,7 +41,7 @@ module "sessionmanager"
 local open_sessions = 0;
 
 function new_session(conn)
-       local session = { conn = conn,  priority = 0, type = "c2s_unauthed", conntime = gettime() };
+       local session = { conn = conn, type = "c2s_unauthed", conntime = gettime() };
        if true then
                session.trace = newproxy(true);
                getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end;
@@ -50,22 +51,19 @@ function new_session(conn)
        local w = conn.write;
        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);
+               
        return session;
 end
 
 function destroy_session(session, err)
        (session.log or log)("info", "Destroying session for %s (%s@%s)", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)");
        
-       -- Send unavailable presence
-       if session.presence then
-               local pres = st.presence{ type = "unavailable" };
-               if (not err) or err == "closed" then err = "connection closed"; end
-               pres:tag("status"):text("Disconnected: "..err):up();
-               session:dispatch_stanza(pres);
-       end
-       
        -- Remove session/resource from user's session list
        if session.full_jid then
+               hosts[session.host].events.fire_event("resource-unbind", {session=session, error=err});
+
                hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
                full_sessions[session.full_jid] = nil;
                        
@@ -130,6 +128,7 @@ function bind_resource(session, resource)
                                };
                                if not next(sessions) then
                                        hosts[session.host].sessions[session.username] = { sessions = sessions };
+                                       bare_sessions[session.username.."@"..session.host] = hosts[session.host].sessions[session.username];
                                end
                        end
                        if increment and sessions[resource] then
@@ -149,6 +148,8 @@ function bind_resource(session, resource)
        
        session.roster = rm_load_roster(session.username, session.host);
        
+       hosts[session.host].events.fire_event("resource-bind", {session=session});
+       
        return true;
 end
 
@@ -161,7 +162,7 @@ function streamopened(session, attr)
        (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host);
        
        send("<?xml version='1.0'?>");
-       send(format("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s' version='1.0'>", session.streamid, session.host));
+       send(format("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s' version='1.0' xml:lang='en'>", session.streamid, session.host));
 
        if not hosts[session.host] then
                -- We don't serve this host...