Merge 0.8->trunk

[prosody.git] / core / s2smanager.lua

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index f2cee43e3c374c80666b767b51cb72fbfffde71e..df201e9ef55e6d897aab417b9660fa39d84e4b53 100644 (file)
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -71,8 +71,7 @@ local function bounce_sendq(session, reason)
                };
                for i, data in ipairs(sendq) do
                        local reply = data[2];
-                       local xmlns = reply.attr.xmlns;
-                       if not(xmlns) and bouncy_stanzas[reply.name] then
+                       if reply and not(reply.attr.xmlns) and bouncy_stanzas[reply.name] then
                                reply.attr.type = "error";
                                reply:tag("error", {type = "cancel"})
                                        :tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
@@ -99,8 +98,8 @@ function send_to_host(from_host, to_host, data)
                        (host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host);
                        
                        -- Queue stanza until we are able to send it
-                       if host.sendq then t_insert(host.sendq, {tostring(data), st.reply(data)});
-                       else host.sendq = { {tostring(data), st.reply(data)} }; end
+                       if host.sendq then t_insert(host.sendq, {tostring(data), data.attr.type ~= "error" and data.attr.type ~= "result" and st.reply(data)});
+                       else host.sendq = { {tostring(data), data.attr.type ~= "error" and data.attr.type ~= "result" and st.reply(data)} }; end
                        host.log("debug", "stanza [%s] queued ", data.name);
                elseif host.type == "local" or host.type == "component" then
                        log("error", "Trying to send a stanza to ourselves??")
@@ -122,11 +121,14 @@ function send_to_host(from_host, to_host, data)
                local host_session = new_outgoing(from_host, to_host);
 
                -- Store in buffer
-               host_session.sendq = { {tostring(data), st.reply(data)} };
+               host_session.sendq = { {tostring(data), data.attr.type ~= "error" and data.attr.type ~= "result" and st.reply(data)} };
                log("debug", "stanza [%s] queued until connection complete", tostring(data.name));
                if (not host_session.connecting) and (not host_session.conn) then
                        log("warn", "Connection to %s failed already, destroying session...", to_host);
-                       destroy_session(host_session);
+                       if not destroy_session(host_session, "Connection failed") then
+                               -- Already destroyed, we need to bounce our stanza
+                               bounce_sendq(host_session, host_session.destruction_reason);
+                       end
                        return false;
                end
        end
@@ -178,6 +180,8 @@ function new_outgoing(from_host, to_host, connect)
                
                hosts[from_host].s2sout[to_host] = host_session;
                
+               host_session.close = destroy_session; -- This gets replaced by xmppserver_listener later
+               
                local log;
                do
                        local conn_name = "s2sout"..tostring(host_session):match("[a-f0-9]*$");
@@ -189,7 +193,11 @@ function new_outgoing(from_host, to_host, connect)
                
                if connect ~= false then
                        -- Kick the connection attempting machine into life
-                       attempt_connection(host_session);
+                       if not attempt_connection(host_session) then
+                               -- Intentionally not returning here, the
+                               -- session is needed, connected or not
+                               destroy_session(host_session);
+                       end
                end
                
                if not host_session.sends2s then
@@ -279,7 +287,7 @@ end
 function try_connect(host_session, connect_host, connect_port)
        host_session.connecting = true;
        local handle;
-       handle = adns.lookup(function (reply)
+       handle = adns.lookup(function (reply, err)
                handle = nil;
                host_session.connecting = nil;
                
@@ -297,12 +305,19 @@ function try_connect(host_session, connect_host, connect_port)
                
                if reply and reply[#reply] and reply[#reply].a then
                        log("debug", "DNS reply for %s gives us %s", connect_host, reply[#reply].a);
-                       return make_connect(host_session, reply[#reply].a, connect_port);
+                       local ok, err = make_connect(host_session, reply[#reply].a, connect_port);
+                       if not ok then
+                               if not attempt_connection(host_session, err or "closed") then
+                                       err = err and (": "..err) or "";
+                                       destroy_session(host_session, "Connection failed"..err);
+                               end
+                       end
                else
                        log("debug", "DNS lookup failed to get a response for %s", connect_host);
                        if not attempt_connection(host_session, "name resolution failed") then -- Retry if we can
                                log("debug", "No other records to try for %s - destroying", host_session.to_host);
-                               destroy_session(host_session, "DNS resolution failed"); -- End of the line, we can't
+                               err = err and (": "..err) or "";
+                               destroy_session(host_session, "DNS resolution failed"..err); -- End of the line, we can't
                        end
                end
        end, connect_host, "A", "IN");
@@ -316,7 +331,7 @@ function make_connect(host_session, connect_host, connect_port)
        
        local from_host, to_host = host_session.from_host, host_session.to_host;
        
-       local conn, handler = socket.tcp()
+       local conn, handler = socket.tcp();
        
        if not conn then
                log("warn", "Failed to create outgoing connection, system error: %s", handler);