root
/
sftp
mirror of https://github.com/pkg/sftp.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

change request.handle() to request.callHandler() 

Handle was already used for sftp's session 'handle' which is the name
used in the other code and sftp specs.
This commit is contained in:
John Eikenberry 2017-08-20 17:51:45 -07:00
parent 06477cae89
commit 19d66c2d96
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
request-server.go
View File

@ -144,7 +144,7 @@ func (rs *RequestServer) packetWorker(pktChan chan requestPacket) error {
} else {
request = requestFromPacket(
&sshFxpStatPacket{ID: pkt.id(), Path: request.Filepath})
rpkt = request.handle(rs.Handlers)
rpkt = request.callHandler(rs.Handlers)
}
case *sshFxpFsetstatPacket:
handle := pkt.getHandle()
@ -156,7 +156,7 @@ func (rs *RequestServer) packetWorker(pktChan chan requestPacket) error {
&sshFxpSetstatPacket{ID: pkt.id(), Path: request.Filepath,
Flags: pkt.Flags, Attrs: pkt.Attrs,
})
rpkt = request.handle(rs.Handlers)
rpkt = request.callHandler(rs.Handlers)
}
case hasHandle:
handle := pkt.getHandle()
@ -165,11 +165,11 @@ func (rs *RequestServer) packetWorker(pktChan chan requestPacket) error {
if !ok {
rpkt = statusFromError(pkt, syscall.EBADF)
} else {
rpkt = request.handle(rs.Handlers)
rpkt = request.callHandler(rs.Handlers)
}
case hasPath:
request := requestFromPacket(pkt)
rpkt = request.handle(rs.Handlers)
rpkt = request.callHandler(rs.Handlers)
default:
return errors.Errorf("unexpected packet type %T", pkt)
}

2
request.go
View File

@ -165,7 +165,7 @@ func (r *Request) popPacket() packet_data {
}
// called from worker to handle packet/request
func (r *Request) handle(handlers Handlers) responsePacket {
func (r *Request) callHandler(handlers Handlers) responsePacket {
switch r.Method {
case "Get":
return fileget(handlers.FileGet, r)

14
request_test.go
View File

@ -122,7 +122,7 @@ func TestRequestGet(t *testing.T) {
request := testRequest("Get")
// req.length is 5, so we test reads in 5 byte chunks
for i, txt := range []string{"file-", "data."} {
pkt := request.handle(handlers)
pkt := request.callHandler(handlers)
dpkt := pkt.(*sshFxpDataPacket)
assert.Equal(t, dpkt.id(), uint32(i+1))
assert.Equal(t, string(dpkt.Data), txt)
@ -132,9 +132,9 @@ func TestRequestGet(t *testing.T) {
func TestRequestPut(t *testing.T) {
handlers := newTestHandlers()
request := testRequest("Put")
pkt := request.handle(handlers)
pkt := request.callHandler(handlers)
statusOk(t, pkt)
pkt = request.handle(handlers)
pkt = request.callHandler(handlers)
statusOk(t, pkt)
assert.Equal(t, "file-data.", handlers.getOutString())
}
@ -142,11 +142,11 @@ func TestRequestPut(t *testing.T) {
func TestRequestCmdr(t *testing.T) {
handlers := newTestHandlers()
request := testRequest("Mkdir")
pkt := request.handle(handlers)
pkt := request.callHandler(handlers)
statusOk(t, pkt)
handlers.returnError()
pkt = request.handle(handlers)
pkt = request.callHandler(handlers)
assert.Equal(t, pkt, statusFromError(pkt, errTest))
}
@ -155,7 +155,7 @@ func TestRequestInfoReadlink(t *testing.T) { testInfoMethod(t, "Readlink") }
func TestRequestInfoStat(t *testing.T) {
handlers := newTestHandlers()
request := testRequest("Stat")
pkt := request.handle(handlers)
pkt := request.callHandler(handlers)
spkt, ok := pkt.(*sshFxpStatResponse)
assert.True(t, ok)
assert.Equal(t, spkt.info.Name(), "request_test.go")
@ -164,7 +164,7 @@ func TestRequestInfoStat(t *testing.T) {
func testInfoMethod(t *testing.T, method string) {
handlers := newTestHandlers()
request := testRequest(method)
pkt := request.handle(handlers)
pkt := request.callHandler(handlers)
npkt, ok := pkt.(*sshFxpNamePacket)
assert.True(t, ok)
assert.IsType(t, sshFxpNameAttr{}, npkt.NameAttrs[0])