mod_tls: Set the sslctx on outgoing connections (possibly the cause of outgoing s2s...

[prosody.git] / core / stanza_router.lua

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 00c37ed7bbea1c16f1d96c54f6f006a27ec21372..12133a8ee7d65e4e8ad3d619dc81df593c6e6318 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -98,7 +98,7 @@ function core_process_stanza(origin, stanza)
                                return; -- FIXME what should we do here? does this work with subdomains?
                        end
                end
-               core_post_stanza(origin, stanza);
+               core_post_stanza(origin, stanza, origin.full_jid);
        else
                local h = hosts[stanza.attr.to or origin.host or origin.to_host];
                if h then
@@ -119,7 +119,7 @@ function core_process_stanza(origin, stanza)
        end
 end
 
-function core_post_stanza(origin, stanza)
+function core_post_stanza(origin, stanza, preevents)
        local to = stanza.attr.to;
        local node, host, resource = jid_split(to);
        local to_bare = node and (node.."@"..host) or host; -- bare JID
@@ -143,7 +143,7 @@ function core_post_stanza(origin, stanza)
        end
 
        local event_data = {origin=origin, stanza=stanza};
-       if origin.full_jid == stanza.attr.from then -- c2s connection
+       if preevents then -- c2s connection
                if hosts[origin.host].events.fire_event('pre-'..stanza.name..to_type, event_data) then return; end -- do preprocessing
        end
        local h = hosts[to_bare] or hosts[host or origin.host];
@@ -180,7 +180,7 @@ function core_route_stanza(origin, stanza)
                        local xmlns = stanza.attr.xmlns;
                        --stanza.attr.xmlns = "jabber:server";
                        stanza.attr.xmlns = nil;
-                       log("debug", "sending s2s stanza: %s", tostring(stanza));
+                       log("debug", "sending s2s stanza: %s", tostring(stanza.top_tag and stanza:top_tag()) or stanza);
                        send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
                        stanza.attr.xmlns = xmlns; -- reset
                else
@@ -191,6 +191,6 @@ function core_route_stanza(origin, stanza)
                log("debug", "Routing outgoing stanza for %s to %s", from_host, host);
                send_s2s(from_host, host, stanza);
        else
-               log("warn", "received stanza from unhandled connection type: %s", origin.type);
+               log("warn", "received %s stanza from unhandled connection type: %s", tostring(stanza.name), tostring(origin.type));
        end
 end