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

convert uses of uint8 instead of fxp to fxp

This commit is contained in:
Cassondra Foesch 2025-05-30 13:29:21 +00:00
parent 9ae47f4170
commit d9ce3caa72
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conn.go
View File

@ -22,7 +22,7 @@ type conn struct {
// For the client mode just pass 0. // For the client mode just pass 0.
// It returns io.EOF if the connection is closed and // It returns io.EOF if the connection is closed and
// there are no more packets to read. // there are no more packets to read.
func (c *conn) recvPacket(orderID uint32) (uint8, []byte, error) { func (c *conn) recvPacket(orderID uint32) (fxp, []byte, error) {
return recvPacket(c, c.alloc, orderID) return recvPacket(c, c.alloc, orderID)
} }
@ -142,7 +142,7 @@ func (c *clientConn) getChannel(sid uint32) (chan<- result, bool) {
// result captures the result of receiving the a packet from the server // result captures the result of receiving the a packet from the server
type result struct { type result struct {
typ byte typ fxp
data []byte data []byte
err error err error
} }
@ -152,7 +152,7 @@ type idmarshaler interface {
encoding.BinaryMarshaler encoding.BinaryMarshaler
} }
func (c *clientConn) sendPacket(ctx context.Context, ch chan result, p idmarshaler) (byte, []byte, error) { func (c *clientConn) sendPacket(ctx context.Context, ch chan result, p idmarshaler) (fxp, []byte, error) {
if cap(ch) < 1 { if cap(ch) < 1 {
ch = make(chan result, 1) ch = make(chan result, 1)
} }

2
packet.go
View File

@ -304,7 +304,7 @@ func sendPacket(w io.Writer, m encoding.BinaryMarshaler) error {
return nil return nil
} }
func recvPacket(r io.Reader, alloc *allocator, orderID uint32) (uint8, []byte, error) { func recvPacket(r io.Reader, alloc *allocator, orderID uint32) (fxp, []byte, error) {
var b []byte var b []byte
if alloc != nil { if alloc != nil {
b = alloc.GetPage(orderID) b = alloc.GetPage(orderID)

2
packet_test.go
View File

@ -468,7 +468,7 @@ func TestRecvPacket(t *testing.T) {
var recvPacketTests = []struct { var recvPacketTests = []struct {
b []byte b []byte
want uint8 want fxp
body []byte body []byte
wantErr error wantErr error
}{ }{

4
request-server.go
View File

@ -148,7 +148,7 @@ func (rs *RequestServer) serveLoop(pktChan chan<- orderedRequest) error {
var err error var err error
var pkt requestPacket var pkt requestPacket
var pktType uint8 var pktType fxp
var pktBytes []byte var pktBytes []byte
for { for {
@ -158,7 +158,7 @@ func (rs *RequestServer) serveLoop(pktChan chan<- orderedRequest) error {
return err return err
} }
pkt, err = makePacket(rxPacket{fxp(pktType), pktBytes}) pkt, err = makePacket(rxPacket{pktType, pktBytes})
if err != nil { if err != nil {
switch { switch {
case errors.Is(err, errUnknownExtendedPacket): case errors.Is(err, errUnknownExtendedPacket):

4
server.go
View File

@ -390,7 +390,7 @@ func (svr *Server) Serve() error {
var err error var err error
var pkt requestPacket var pkt requestPacket
var pktType uint8 var pktType fxp
var pktBytes []byte var pktBytes []byte
for { for {
pktType, pktBytes, err = svr.serverConn.recvPacket(svr.pktMgr.getNextOrderID()) pktType, pktBytes, err = svr.serverConn.recvPacket(svr.pktMgr.getNextOrderID())
@ -403,7 +403,7 @@ func (svr *Server) Serve() error {
break break
} }
pkt, err = makePacket(rxPacket{fxp(pktType), pktBytes}) pkt, err = makePacket(rxPacket{pktType, pktBytes})
if err != nil { if err != nil {
switch { switch {
case errors.Is(err, errUnknownExtendedPacket): case errors.Is(err, errUnknownExtendedPacket):

8
sftp.go
View File

@ -184,15 +184,15 @@ func (f fx) String() string {
} }
type unexpectedPacketErr struct { type unexpectedPacketErr struct {
want, got uint8 want, got fxp
} }
func (u *unexpectedPacketErr) Error() string { func (u *unexpectedPacketErr) Error() string {
return fmt.Sprintf("sftp: unexpected packet: want %v, got %v", fxp(u.want), fxp(u.got)) return fmt.Sprintf("sftp: unexpected packet: want %v, got %v", u.want, u.got)
} }
func unimplementedPacketErr(u uint8) error { func unimplementedPacketErr(u fxp) error {
return fmt.Errorf("sftp: unimplemented packet type: got %v", fxp(u)) return fmt.Errorf("sftp: unimplemented packet type: got %v", u)
} }
type unexpectedIDErr struct{ want, got uint32 } type unexpectedIDErr struct{ want, got uint32 }