diff options
| author | Kim Alvefur <zash@zash.se> | 2018-11-26 19:48:07 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-11-26 19:48:07 +0100 |
| commit | 6f941bbc641b99880b719c78f8ca36e43787c470 (patch) | |
| tree | 6cc3fc3f6390537ab089fd26702fd4f4d63e5524 | |
| parent | ad38cc8fbefecf882bb2c2abbee1f410760d02a6 (diff) | |
| parent | 7093d062f74095cc75d9a234626d1ce9a7e202df (diff) | |
| download | prosody-6f941bbc641b99880b719c78f8ca36e43787c470.tar.gz prosody-6f941bbc641b99880b719c78f8ca36e43787c470.zip | |
Merge 0.10->0.11
| -rw-r--r-- | plugins/mod_proxy65.lua | 8 |
1 files changed, 7 insertions, 1 deletions
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)})); |