util.events: Remove an event's table when it has no more handlers.

[prosody.git] / plugins / mod_proxy65.lua

diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua
index f790f91d1ddabb0420eef6e9fe0b1b80470636d6..5b49073071736281f75752a4e54588a293229e08 100644 (file)
--- a/plugins/mod_proxy65.lua
+++ b/plugins/mod_proxy65.lua
@@ -33,7 +33,7 @@ local connlistener = { default_port = proxy_port, default_interface = proxy_inte
 function connlistener.onincoming(conn, data)
        local session = sessions[conn] or {};
        
-       if session.setup == nil and data ~= nil and data:byte(1) == 0x05 and data:len() > 2 then
+       if session.setup == nil and data ~= nil and data:byte(1) == 0x05 and #data > 2 then
                local nmethods = data:byte(2);
                local methods = data:sub(3);
                local supported = false;
@@ -63,7 +63,7 @@ function connlistener.onincoming(conn, data)
                                return;
                        end
                end
-               if data ~= nil and data:len() == 0x2F and  -- 40 == length of SHA1 HASH, and 7 other bytes => 47 => 0x2F
+               if data ~= nil and #data == 0x2F and  -- 40 == length of SHA1 HASH, and 7 other bytes => 47 => 0x2F
                        data:byte(1) == 0x05 and -- SOCKS5 has 5 in first byte
                        data:byte(2) == 0x01 and -- CMD must be 1
                        data:byte(3) == 0x00 and -- RSV must be 0
@@ -86,7 +86,7 @@ function connlistener.onincoming(conn, data)
                                server.link(conn, transfers[sha].target, max_buffer_size);
                                server.link(transfers[sha].target, conn, max_buffer_size);
                        end
-                       conn:write(string.char(5, 0, 0, 3, sha:len()) .. sha .. string.char(0, 0)); -- VER, REP, RSV, ATYP, BND.ADDR (sha), BND.PORT (2 Byte)
+                       conn:write(string.char(5, 0, 0, 3, #sha) .. sha .. string.char(0, 0)); -- VER, REP, RSV, ATYP, BND.ADDR (sha), BND.PORT (2 Byte)
                        conn:lock_read(true)
                else
                        module:log("warn", "Neither data transfer nor initial connect of a participator of a transfer.")
@@ -117,6 +117,9 @@ function connlistener.ondisconnect(conn, err)
        end
 end
 
+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;
        local reply = replies_cache.disco_info;
@@ -192,15 +195,12 @@ module.unload = function()
 end
 
 local function set_activation(stanza)
-       local from, to, sid, reply = nil;
-       from = stanza.attr.from;
-       if stanza.tags[1] ~= nil and tostring(stanza.tags[1].name) == "query" then
-               if stanza.tags[1].attr ~= nil then
-                       sid = stanza.tags[1].attr.sid;
-               end
-               if stanza.tags[1].tags[1] ~= nil and tostring(stanza.tags[1].tags[1].name) == "activate" then
-                       to = stanza.tags[1].tags[1][1];
-               end
+       local to, reply;
+       local from = stanza.attr.from;
+       local query = stanza.tags[1];
+       local sid = query.attr.sid;
+       if query.tags[1] and query.tags[1].name == "activate" then
+               to = query.tags[1][1];
        end
        if from ~= nil and to ~= nil and sid ~= nil then
                reply = st.iq({type="result", from=host, to=from});