Merge 0.10->trunk

[prosody.git] / plugins / mod_proxy65.lua

diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua
index 2ed9faace27d747c0f228b96b1d7f334efe9fe13..cbbfad12cb45fd06c2653ec47bf369f8ba294592 100644 (file)
--- a/plugins/mod_proxy65.lua
+++ b/plugins/mod_proxy65.lua
@@ -91,9 +91,9 @@ end
 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("proxy65_address", host);
+       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("proxy65_acl");
+       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
        local legacy_config = module:get_option_number("proxy65_port");
@@ -101,27 +101,10 @@ function module.add_host(module)
                module:log("warn", "proxy65_port is deprecated, please put proxy65_ports = { %d } into the global section instead", legacy_config);
        end
 
+       module:depends("disco");
        module:add_identity("proxy", "bytestreams", name);
        module:add_feature("http://jabber.org/protocol/bytestreams");
 
-       module:hook("iq-get/host/http://jabber.org/protocol/disco#info:query", function(event)
-               local origin, stanza = event.origin, event.stanza;
-               if not stanza.tags[1].attr.node then
-                       origin.send(st.reply(stanza):query("http://jabber.org/protocol/disco#info")
-                               :tag("identity", {category='proxy', type='bytestreams', name=name}):up()
-                               :tag("feature", {var="http://jabber.org/protocol/bytestreams"}) );
-                       return true;
-               end
-       end, -1);
-
-       module:hook("iq-get/host/http://jabber.org/protocol/disco#items:query", function(event)
-               local origin, stanza = event.origin, event.stanza;
-               if not stanza.tags[1].attr.node then
-                       origin.send(st.reply(stanza):query("http://jabber.org/protocol/disco#items"));
-                       return true;
-               end
-       end, -1);
-
        module:hook("iq-get/host/http://jabber.org/protocol/bytestreams:query", function(event)
                local origin, stanza = event.origin, event.stanza;