mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->0.11

Browse source
This commit is contained in:
Kim Alvefur 2018-11-26 19:48:07 +01:00
commit 6f941bbc64
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_proxy65.lua
View file

@ -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)}));