Merge with trunk.

[prosody.git] / plugins / mod_proxy65.lua

diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua
index 01ff9befe202bc75ea66b53405de8115e6a84513..2cfbe7b632addec9207c8ae7810daade953127a4 100644 (file)
--- a/plugins/mod_proxy65.lua
+++ b/plugins/mod_proxy65.lua
@@ -55,8 +55,12 @@ function connlistener.onincoming(conn, data)
        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
@@ -81,8 +85,10 @@ function connlistener.onincoming(conn, data)
                                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:lock_read(true)
                else
                        module:log("warn", "Neither data transfer nor initial connect of a participator of a transfer.")
                        conn.close();
@@ -238,6 +244,8 @@ function handle_to_domain(origin, stanza)
                                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));
@@ -254,7 +262,7 @@ end
 
 connlisteners.start(module.host .. ':proxy65');
 component = componentmanager.register_component(host, handle_to_domain);
-local sender_lock_threshold = 1024;
+local sender_lock_threshold = 4096;
 function throttle_sending(sender, receiver)
        sender:pattern(sender_lock_threshold);
        local sender_locked;
@@ -262,7 +270,7 @@ function throttle_sending(sender, receiver)
        function receiver.sendbuffer()
                _sendbuffer();
                if sender_locked and receiver.bufferlen() < sender_lock_threshold then
-                       sender:lock(false); -- Unlock now
+                       sender:lock_read(false); -- Unlock now
                        sender_locked = nil;
                end
        end
@@ -272,7 +280,7 @@ function throttle_sending(sender, receiver)
                _readbuffer();
                if not sender_locked and receiver.bufferlen() >= sender_lock_threshold then
                        sender_locked = true;
-                       sender:lock(true);
+                       sender:lock_read(true);
                end
        end
 end