Merge with trunk

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 59f0eadf8087910294dad2feb31b21d11641bb5c..7e609f22055b33f94fde119081613f99e19ae757 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -11,7 +11,6 @@
 local tonumber, tostring = tonumber, tostring;
 local ipairs, pairs, print, next= ipairs, pairs, print, next;
 local collectgarbage = collectgarbage;
-local m_random = import("math", "random");
 local format = import("string", "format");
 
 local hosts = hosts;
@@ -28,11 +27,13 @@ local config_get = require "core.configmanager".get;
 local nameprep = require "util.encodings".stringprep.nameprep;
 
 local fire_event = require "core.eventmanager".fire_event;
-
+local add_task = require "util.timer".add_task;
 local gettime = require "socket".gettime;
 
 local st = require "util.stanza";
 
+local c2s_timeout = config_get("*", "core", "c2s_timeout");
+
 local newproxy = newproxy;
 local getmetatable = getmetatable;
 
@@ -49,10 +50,18 @@ 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(tostring(t)); end
-       session.ip = conn.ip();
+       session.send = function (t) w(conn, tostring(t)); end
+       session.ip = conn:ip();
        local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
        session.log = logger.init(conn_name);
+       
+       if c2s_timeout then
+               add_task(c2s_timeout, function ()
+                       if session.type == "c2s_unauthed" then
+                               session:close("connection-timeout");
+                       end
+               end);
+       end
                
        return session;
 end
@@ -158,31 +167,32 @@ function streamopened(session, attr)
        session.host = attr.to or error("Client failed to specify destination hostname");
        session.host = nameprep(session.host);
        session.version = tonumber(attr.version) or 0;
-       session.streamid = m_random(1000000, 99999999);
+       session.streamid = uuid_generate();
        (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' xml:lang='en'>", session.streamid, session.host));
 
        if not hosts[session.host] then
                -- We don't serve this host...
                session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)};
                return;
        end
-       
+
+       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' xml:lang='en'>", session.streamid, session.host));
+
+       (session.log or log)("debug", "Sent reply <stream:stream> to client");
+       session.notopen = nil;
+
        -- If session.secure is *false* (not nil) then it means we /were/ encrypting
        -- since we now have a new stream header, session is secured
        if session.secure == false then
                session.secure = true;
        end
-                                               
+
        local features = st.stanza("stream:features");
        fire_event("stream-features", session, features);
-       
+
        send(features);
-       
-       (session.log or log)("debug", "Sent reply <stream:stream> to client");
-       session.notopen = nil;
+
 end
 
 function streamclosed(session)