Software / code / prosody
Changeset
9646:eb543e4a47e2
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 26 Nov 2018 19:48:17 +0100 |
| parents | 9641:0ce404230388 (current diff) 9645:cc642c9c5ad5 (diff) |
| children | 9647:0f43b901c854 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_csi_simple.lua Sun Nov 25 13:31:40 2018 +0100 +++ b/plugins/mod_csi_simple.lua Mon Nov 26 19:48:17 2018 +0100 @@ -81,7 +81,7 @@ pump:pause(); session.pump = pump; function session.send(stanza) - if module:fire_event("csi-stanza-is-important", { stanza = stanza, session = session }) then + if module:fire_event("csi-is-stanza-important", { stanza = stanza, session = session }) then pump:flush(); send(stanza); else
--- a/plugins/mod_proxy65.lua Sun Nov 25 13:31:40 2018 +0100 +++ b/plugins/mod_proxy65.lua Mon Nov 26 19:48:17 2018 +0100 @@ -93,7 +93,6 @@ local host, name = module:get_host(), module:get_option_string("name", "SOCKS5 Bytestreams Service"); local proxy_address = module:get_option_string("proxy65_address", host); - local proxy_port = next(portmanager.get_active_services():search("proxy65", nil)[1] or {}); local proxy_acl = module:get_option_array("proxy65_acl"); -- COMPAT w/pre-0.9 where proxy65_port was specified in the components section of the config @@ -123,6 +122,13 @@ return true; end + local proxy_port = next(portmanager.get_active_services():search("proxy65", nil)[1] or {}); + if not proxy_port then + module:log("warn", "Not listening on any port"); + origin.send(st.error_reply(stanza, "wait", "item-not-found", "Not listening on any port")); + return true; + end + local sid = stanza.tags[1].attr.sid; origin.send(st.reply(stanza):tag("query", {xmlns="http://jabber.org/protocol/bytestreams", sid=sid}) :tag("streamhost", {jid=host, host=proxy_address, port=("%d"):format(proxy_port)}));
