projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_tls: Remove origin type check when TLS is requested (thanks MattJ).
[prosody.git]
/
core
/
stanza_router.lua
diff --git
a/core/stanza_router.lua
b/core/stanza_router.lua
index ad312b850ef16d4dbe2ae7e70c5ba2b92fd9c6b2..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
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
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
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
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};
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];
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];
@@
-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("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
end
end