8000 fix sendError usage to match packet type signature · etherscan-io/sftp@b50b1f9 · GitHub
[go: up one dir, main page]
Skip to content

Commit b50b1f9

Browse files
eikenbeikenb
committed
fix sendError usage to match packet type signature
sendError takes a requestPacket but was simplifying it to an ider interface. Future work needed it to be requestPacket but I wanted to fix didn't up type usage in its own commit.
1 parent 523bded commit b50b1f9

File tree

2 files changed

+9
-9
lines changed

‎packet.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -956,5 +956,5 @@ func (p *sshFxpExtendedPacketPosixRename) UnmarshalBinary(b []byte) error {
956956

957957
func (p sshFxpExtendedPacketPosixRename) respond(s *Server) error {
958958
err := os.Rename(p.Oldpath, p.Newpath)
959-
return s.sendError(p, err)
959+
return s.sendError(&p, err)
960960
}

‎server.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ func (svr *Server) sendPacket(pkt responsePacket) error {
342342
return nil
343343
}
344344

345-
func (svr *Server) sendError(p ider, err error) error {
345+
func (svr *Server) sendError(p requestPacket, err error) error {
346346
return svr.sendPacket(statusFromError(p, err))
347347
}
348348

@@ -390,7 +390,7 @@ func (p sshFxpOpenPacket) respond(svr *Server) error {
390390
osFlags |= os.O_RDONLY
391391
} else {
392392
// how are they opening?
393-
return svr.sendError(p, syscall.EINVAL)
393+
return svr.sendError(&p, syscall.EINVAL)
394394
}
395395

396396
if p.hasPflags(ssh_FXF_APPEND) {
@@ -408,7 +408,7 @@ func (p sshFxpOpenPacket) respond(svr *Server) error {
408408

409409
f, err := os.OpenFile(p.Path, osFlags, 0644)
410410
if err != nil {
411-
return svr.sendError(p, err)
411+
return svr.sendError(&p, err)
412412
}
413413

414414
handle := svr.nextHandle(f)
@@ -418,13 +418,13 @@ func (p sshFxpOpenPacket) respond(svr *Server) error {
418418
func (p sshFxpReaddirPacket) respond(svr *Server) error {
419419
f, ok := svr.getHandle(p.Handle)
420420
if !ok {
421-
return svr.sendError(p, syscall.EBADF)
421+
return svr.sendError(&p, syscall.EBADF)
422422
}
423423

424424
dirname := f.Name()
425425
dirents, err := f.Readdir(128)
426426
if err != nil {
427-
return svr.sendError(p, err)
427+
return svr.sendError(&p, err)
428428
}
429429

430430
ret := sshFxpNamePacket{ID: p.ID}
@@ -477,13 +477,13 @@ func (p sshFxpSetstatPacket) respond(svr *Server) error {
477477
}
478478
}
479479

480-
return svr.sendError(p, err)
480+
return svr.sendError(&p, err)
481481
}
482482

483483
func (p sshFxpFsetstatPacket) respond(svr *Server) error {
484484
f, ok := svr.getHandle(p.Handle)
485485
if !ok {
486-
return svr.sendError(p, syscall.EBADF)
486+
return svr.sendError(&p, syscall.EBADF)
487487
}
488488

489489
// additional unmarshalling is required for each possibility here
@@ -524,7 +524,7 @@ func (p sshFxpFsetstatPacket) respond(svr *Server) error {
524524
}
525525
}
526526

527-
return svr.sendError(p, err)
527+
return svr.sendError(&p, err)
528528
}
529529

530530
// translateErrno translates a syscall error number to a SFTP error code.

0 commit comments

Comments
 (0)
0