util.pposix: Replace the unwieldy module table generation with luaL_register() call...

[prosody.git] / core / s2smanager.lua

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 9eb3bb244541f976191658f70b60aa4954d99be6..af5e91e3585705eb946b68a2ca3759a53848232c 100644 (file)
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -41,7 +41,6 @@ local config = require "core.configmanager";
 local connect_timeout = config.get("*", "core", "s2s_timeout") or 60;
 local dns_timeout = config.get("*", "core", "dns_timeout") or 60;
 local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3;
-local dialback_secret = config.get("*", "core", "dialback_secret") or uuid_gen();
 
 incoming_s2s = {};
 _G.prosody.incoming_s2s = incoming_s2s;
@@ -149,9 +148,10 @@ function new_incoming(conn)
        return session;
 end
 
-function new_outgoing(from_host, to_host)
+function new_outgoing(from_host, to_host, connect)
                local host_session = { to_host = to_host, from_host = from_host, host = from_host,
-                                      notopen = true, type = "s2sout_unauthed", direction = "outgoing" };
+                                      notopen = true, type = "s2sout_unauthed", direction = "outgoing",
+                                      open_stream = session_open_stream };
                
                hosts[from_host].s2sout[to_host] = host_session;
                
@@ -162,8 +162,10 @@ function new_outgoing(from_host, to_host)
                        host_session.log = log;
                end
                
-               -- Kick the connection attempting machine
-               attempt_connection(host_session);
+               if connect ~= false then
+                       -- Kick the connection attempting machine into life
+                       attempt_connection(host_session);
+               end
                
                if not host_session.sends2s then
                        -- A sends2s which buffers data (until the stream is opened)
@@ -325,7 +327,8 @@ function make_connect(host_session, connect_host, connect_port)
        local w, log = conn.write, host_session.log;
        host_session.sends2s = function (t) log("debug", "sending: %s", (t.top_tag and t:top_tag()) or t:match("^[^>]*>?")); w(conn, tostring(t)); end
        
-       conn:write(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0' xml:lang='en'>]], from_host, to_host));
+       host_session:open_stream();
+       
        log("debug", "Connection attempt in progress...");
        add_task(connect_timeout, function ()
                if host_session.conn ~= conn or
@@ -341,6 +344,13 @@ function make_connect(host_session, connect_host, connect_port)
        return true;
 end
 
+function session_open_stream(session, from, to)
+       session.sends2s(st.stanza("stream:stream", {
+               xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback',
+               ["xmlns:stream"]='http://etherx.jabber.org/streams',
+               from=from, to=to, version='1.0', ["xml:lang"]='en'}):top_tag());
+end
+
 function streamopened(session, attr)
        local send = session.sends2s;
        
@@ -370,7 +380,7 @@ function streamopened(session, attr)
                end
                send("<?xml version='1.0'?>");
                send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback',
-                               ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host, version=(session.version > 0 and "1.0" or nil) }):top_tag());
+                               ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host, to=session.from_host, version=(session.version > 0 and "1.0" or nil) }):top_tag());
                if session.version >= 1.0 then
                        local features = st.stanza("stream:features");
                        
@@ -431,7 +441,7 @@ function initiate_dialback(session)
 end
 
 function generate_dialback(id, to, from)
-       return sha256_hash(id..to..from..dialback_secret, true);
+       return sha256_hash(id..to..from..hosts[from].dialback_secret, true);
 end
 
 function verify_dialback(id, to, from, key)