error("proxy65 should be loaded as a component, please see http://prosody.im/doc/components", 0);
end
-local jid_split = require "util.jid".split;
+local jid_split, jid_join = require "util.jid".split, require "util.jid".join;
local st = require "util.stanza";
local componentmanager = require "core.componentmanager";
local config_get = require "core.configmanager".get;
local connlistener = { default_port = proxy_port, default_interface = proxy_interface, default_mode = "*a" };
-function connlistener.listener(conn, data)
+function connlistener.onincoming(conn, data)
local session = sessions[conn] or {};
if session.setup == nil and data ~= nil and data:sub(1):byte() == 0x05 and data:len() > 2 then
module:log("debug", "new session found ... ")
session.setup = true;
sessions[conn] = session;
- conn.write(string.char(5, 0));
+ conn:write(string.char(5, 0));
end
return;
end
if session.setup then
if session.sha ~= nil and transfers[session.sha] ~= nil then
local sha = session.sha;
- if transfers[sha].activated == true and transfers[sha].initiator == conn and transfers[sha].target ~= nil then
- transfers[sha].target.write(data);
+ if transfers[sha].activated == true and transfers[sha].target ~= nil then
+ if transfers[sha].initiator == conn then
+ transfers[sha].target:write(data);
+ else
+ transfers[sha].initiator:write(data);
+ end
return;
end
end
data:sub(4):byte() == 0x03 and -- ATYP must be 3
data:sub(5):byte() == 40 and -- SHA1 HASH length must be 40 (0x28)
data:sub(-2):byte() == 0x00 and -- PORT must be 0, size 2 byte
- data:sub(-1):byte() == 0x00
+ data:sub(-1):byte() == 0x00
then
local sha = data:sub(6, 45); -- second param is not count! it's the ending index (included!)
if transfers[sha] == nil then
transfers[sha].initiator = conn;
session.sha = sha;
module:log("debug", "initiator connected ... ");
+ throttle_sending(conn, transfers[sha].target);
+ throttle_sending(transfers[sha].target, conn);
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:len()) .. sha .. string.char(0, 0)); -- VER, REP, RSV, ATYP, BND.ADDR (sha), BND.PORT (2 Byte)
+ conn:lock_read(true)
else
- log:module("warn", "Neither data transfer nor initial connect of a participator of a transfer.")
- conn.close();
+ module:log("warn", "Neither data transfer nor initial connect of a participator of a transfer.")
+ conn:close();
end
else
if data ~= nil then
module:log("warn", "unknown connection with no authentication data -> closing it");
- conn.close();
+ conn:close();
end
end
end
-function connlistener.disconnect(conn, err)
+function connlistener.ondisconnect(conn, err)
local session = sessions[conn];
if session then
if session.sha and transfers[session.sha] then
local initiator, target = transfers[session.sha].initiator, transfers[session.sha].target;
if initiator == conn and target ~= nil then
- target.close();
+ target:close();
elseif target == conn and initiator ~= nil then
- initiator.close();
+ initiator:close();
end
transfers[session.sha] = nil;
end
return reply;
end
-local function _jid_join(node, host, resource)
- local ret = host;
- if ret then
- if node then
- ret = node .. "@" .. ret;
- end
- if resource then
- ret = ret .. "/" .. resource;
- end
- end
- return ret;
-end
-
local function get_stream_host(origin, stanza)
local reply = replies_cache.stream_host;
local err_reply = replies_cache.stream_host_err;
replies_cache.stream_host = reply;
end
else
- module:log("warn", "Denying use of proxy for %s", tostring(_jid_join(jid_node, jid_host, jid_resource)));
+ module:log("warn", "Denying use of proxy for %s", tostring(jid_join(jid_node, jid_host, jid_resource)));
if err_reply == nil then
err_reply = st.iq({type="error", from=host})
:query("http://jabber.org/protocol/bytestreams")
elseif(transfers[sha] ~= nil and transfers[sha].initiator ~= nil and transfers[sha].target ~= nil) then
origin.send(reply);
transfers[sha].activated = true;
+ transfers[sha].target:lock_read(false);
+ transfers[sha].initiator:lock_read(false);
end
else
module:log("error", "activation failed: sid: %s, initiator: %s, target: %s", tostring(sid), tostring(from), tostring(to));
end
if not connlisteners.register(module.host .. ':proxy65', connlistener) then
- error("mod_proxy65: Could not establish a connection listener. Check your configuration please.");
- error(" one possible cause for this would be that two proxy65 components share the same port.");
+ module:log("error", "mod_proxy65: Could not establish a connection listener. Check your configuration please.");
+ module:log("error", "Possibly two proxy65 components are configured to share the same port.");
end
connlisteners.start(module.host .. ':proxy65');
component = componentmanager.register_component(host, handle_to_domain);
+local sender_lock_threshold = 4096;
+function throttle_sending(sender, receiver)
+ sender:pattern(sender_lock_threshold);
+ local sender_locked;
+ local _sendbuffer = receiver.sendbuffer;
+ function receiver.sendbuffer()
+ _sendbuffer();
+ if sender_locked and receiver.bufferlen() < sender_lock_threshold then
+ sender:lock_read(false); -- Unlock now
+ sender_locked = nil;
+ end
+ end
+
+ local _readbuffer = sender.readbuffer;
+ function sender.readbuffer()
+ _readbuffer();
+ if not sender_locked and receiver.bufferlen() >= sender_lock_threshold then
+ sender_locked = true;
+ sender:lock_read(true);
+ end
+ end
+end