aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2009-12-01 23:05:32 +0100
committerTobias Markmann <tm@ayena.de>2009-12-01 23:05:32 +0100
commit80ea872f432f8dd4465869bd24383539cf02c261 (patch)
treecfda9c9c795a36f1f628917d9cd174bdcbc97115 /plugins
parent8c48053170aa1d6f0bfc057edf6fd7ede1c6a507 (diff)
parent0cbbfc225c549ab4f82f658330132361d07969aa (diff)
downloadprosody-80ea872f432f8dd4465869bd24383539cf02c261.tar.gz
prosody-80ea872f432f8dd4465869bd24383539cf02c261.zip
Merge with tip.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_proxy65.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua
index 504cfc0c..b2f901af 100644
--- a/plugins/mod_proxy65.lua
+++ b/plugins/mod_proxy65.lua
@@ -67,7 +67,7 @@ function connlistener.onincoming(conn, data)
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
@@ -83,7 +83,7 @@ function connlistener.onincoming(conn, data)
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)
else
- log:module("warn", "Neither data transfer nor initial connect of a participator of a transfer.")
+ module:log("warn", "Neither data transfer nor initial connect of a participator of a transfer.")
conn.close();
end
else