diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2010-12-03 00:21:49 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2010-12-03 00:21:49 +0500 |
| commit | 21e7290e0146868e490de53e52f2ff0d6cd62b7b (patch) | |
| tree | 29bbe981e15bc6eb30d6dba792ec677aeebe6f44 | |
| parent | d6c3755d2c6b7c2b4a9d872126f33e99efcd906d (diff) | |
| download | prosody-21e7290e0146868e490de53e52f2ff0d6cd62b7b.tar.gz prosody-21e7290e0146868e490de53e52f2ff0d6cd62b7b.zip | |
mod_proxy65: s:len() -> #s.
| -rw-r--r-- | plugins/mod_proxy65.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua index f790f91d..565cb38f 100644 --- 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.") |