util.xmppstream: Optimized stanza building by bypassing the stanza API.

[prosody.git] / core / s2smanager.lua

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 2f6c847891776414a7974330c847aacb59caaa2b..7e6f8135791df3a6d0734fbace1ce92898608223 100644 (file)
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -106,6 +106,7 @@ function send_to_host(from_host, to_host, data)
                        log("error", "Trying to send a stanza to ourselves??")
                        log("error", "Traceback: %s", get_traceback());
                        log("error", "Stanza: %s", tostring(data));
+                       return false;
                else
                        (host.log or log)("debug", "going to send stanza to "..to_host.." from "..from_host);
                        -- FIXME
@@ -125,9 +126,14 @@ function send_to_host(from_host, to_host, 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
+       return true;
 end
 
 local open_sessions = 0;
@@ -175,6 +181,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]*$");
@@ -186,7 +194,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
@@ -276,7 +288,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;
                
@@ -294,12 +306,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");
@@ -313,7 +332,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);
@@ -552,7 +571,7 @@ function mark_connected(session)
        session.log("info", session.direction.." s2s connection "..from.."->"..to.." complete");
        
        local send_to_host = send_to_host;
-       function session.send(data) send_to_host(to, from, data); end
+       function session.send(data) return send_to_host(to, from, data); end
        
        local event_data = { session = session };
        if session.type == "s2sout" then
@@ -589,7 +608,7 @@ local resting_session = { -- Resting, not dead
                filter = function (type, data) return data; end;
        }; resting_session.__index = resting_session;
 
-function retire_session(session)
+function retire_session(session, reason)
        local log = session.log or log;
        for k in pairs(session) do
                if k ~= "trace" and k ~= "log" and k ~= "id" then
@@ -597,6 +616,8 @@ function retire_session(session)
                end
        end
 
+       session.destruction_reason = reason;
+
        function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); end
        function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end
        return setmetatable(session, resting_session);
@@ -626,7 +647,8 @@ function destroy_session(session, reason)
                end
        end
        
-       retire_session(session); -- Clean session until it is GC'd
+       retire_session(session, reason); -- Clean session until it is GC'd
+       return true;
 end
 
 return _M;