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 42aa1016b13b50abadfe7a157c26639f30298832..af5e91e3585705eb946b68a2ca3759a53848232c 100644 (file)
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -150,7 +150,8 @@ end
 
 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;
                
@@ -326,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
@@ -342,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;