dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-12-27 04:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Have to check retr or stor command result before accepting data connection.

Browse Source
This commit is contained in:
Diego Nehab 2004-05-25 05:49:07 +00:00
parent 888496aa82
commit 5c13076f89
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ftp.lua
View File

@ -98,13 +98,13 @@ function metat.__index:send(sendt)
socket.try(self.pasvt or self.portt, "need port or pasv first") socket.try(self.pasvt or self.portt, "need port or pasv first")
if self.pasvt then data = socket.try(pasv(self.pasvt)) end if self.pasvt then data = socket.try(pasv(self.pasvt)) end
socket.try(self.tp:command(sendt.command, sendt.argument)) socket.try(self.tp:command(sendt.command, sendt.argument))
local code, reply = socket.try(self.tp:check{"2..", "1.."})
if self.portt then data = socket.try(port(self.portt)) end if self.portt then data = socket.try(port(self.portt)) end
local step = sendt.step or ltn12.pump.step local step = sendt.step or ltn12.pump.step
local code, reply
local checkstep = function(src, snk) local checkstep = function(src, snk)
local readyt = socket.select(readt, nil, 0) local readyt = socket.select(readt, nil, 0)
if readyt[tp] then if readyt[tp] then
code, reply = self.tp:check{"2..", "1.."} code, reply = self.tp:check("2..")
if not code then if not code then
data:close() data:close()
return nil, reply return nil, reply
@ -116,7 +116,6 @@ function metat.__index:send(sendt)
end end
local sink = socket.sink("close-when-empty", data) local sink = socket.sink("close-when-empty", data)
socket.try(ltn12.pump.all(sendt.source, sink, checkstep)) socket.try(ltn12.pump.all(sendt.source, sink, checkstep))
if not code then code = socket.try(self.tp:check{"1..", "2.."}) end
if string.find(code, "1..") then socket.try(self.tp:check("2..")) end if string.find(code, "1..") then socket.try(self.tp:check("2..")) end
return 1 return 1
end end
@ -126,6 +125,7 @@ function metat.__index:receive(recvt)
socket.try(self.pasvt or self.portt, "need port or pasv first") socket.try(self.pasvt or self.portt, "need port or pasv first")
if self.pasvt then data = socket.try(pasv(self.pasvt)) end if self.pasvt then data = socket.try(pasv(self.pasvt)) end
socket.try(self.tp:command(recvt.command, recvt.argument)) socket.try(self.tp:command(recvt.command, recvt.argument))
local code = socket.try(self.tp:check{"1..", "2.."})
if self.portt then data = socket.try(port(self.portt)) end if self.portt then data = socket.try(port(self.portt)) end
local source = socket.source("until-closed", data) local source = socket.source("until-closed", data)
local step = recvt.step or ltn12.pump.step local step = recvt.step or ltn12.pump.step
@ -135,7 +135,6 @@ function metat.__index:receive(recvt)
return ret, err return ret, err
end end
socket.try(ltn12.pump.all(source, recvt.sink, checkstep)) socket.try(ltn12.pump.all(source, recvt.sink, checkstep))
local code = socket.try(self.tp:check{"1..", "2.."})
if string.find(code, "1..") then socket.try(self.tp:check("2..")) end if string.find(code, "1..") then socket.try(self.tp:check("2..")) end
return 1 return 1
end end