diff options
| author | Kim Alvefur <zash@zash.se> | 2018-11-26 19:48:17 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-11-26 19:48:17 +0100 |
| commit | 88940a3559cbe1ce175bcf6969b233dbb4bdd7c4 (patch) | |
| tree | 85d6d20c047083f69ae4dc5b4c50afd3e6419519 | |
| parent | 56227ef034709e59ffcd56470082c201ba731474 (diff) | |
| parent | 6f941bbc641b99880b719c78f8ca36e43787c470 (diff) | |
| download | prosody-88940a3559cbe1ce175bcf6969b233dbb4bdd7c4.tar.gz prosody-88940a3559cbe1ce175bcf6969b233dbb4bdd7c4.zip | |
Merge 0.11->trunk
| -rw-r--r-- | plugins/mod_csi_simple.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_proxy65.lua | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/plugins/mod_csi_simple.lua b/plugins/mod_csi_simple.lua index c8151df5..f3df5734 100644 --- a/plugins/mod_csi_simple.lua +++ b/plugins/mod_csi_simple.lua @@ -81,7 +81,7 @@ module:hook("csi-client-inactive", function (event) 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 diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua index 71014e79..00833772 100644 --- a/plugins/mod_proxy65.lua +++ b/plugins/mod_proxy65.lua @@ -93,7 +93,6 @@ function module.add_host(module) 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 @@ function module.add_host(module) 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)})); |