Merge 0.7->trunk

[prosody.git] / plugins / mod_proxy65.lua

diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua
index b2f901af86311ac92f4dc766f9ee8bb5071ce8b4..5c9ae3293128853c5a54c4e47f50e7b0bf8f66b1 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
@@ -80,16 +84,19 @@ function connlistener.onincoming(conn, data)
                                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:lock_read(true)
                else
                        module:log("warn", "Neither data transfer nor initial connect of a participator of a transfer.")
-                       conn.close();
+                       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
@@ -100,9 +107,9 @@ function connlistener.ondisconnect(conn, err)
                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
@@ -237,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));
@@ -247,9 +256,31 @@ function handle_to_domain(origin, stanza)
 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