commit 51cb116815c32c76a45365e63b31b099b44d776e
author John Eikenberry <jae@zhar.net> Mon Mar 13 18:24:32 2017 -0700
committer John Eikenberry <jae@zhar.net> Thu Mar 23 16:15:04 2017 -0700
tree 9aa2c007a3fe4ad25cec7238c144c8ac3de26b81
parent 89c474ca1d8dcced18326fcb82d46fda6647c5d5

better name: packet -> requestPacket

packet-typing.go

diff --git a/packet-typing.go b/packet-typing.go
index c5d4792..eb02953 100644
--- a/packet-typing.go
+++ b/packet-typing.go
@@ -7,7 +7,7 @@
 )
 
 // all incoming packets
-type packet interface {
+type requestPacket interface {
 	encoding.BinaryUnmarshaler
 	id() uint32
 }
@@ -18,12 +18,12 @@
 
 // interfaces to group types
 type hasPath interface {
-	packet
+	requestPacket
 	getPath() string
 }
 
 type hasHandle interface {
-	packet
+	requestPacket
 	getHandle() string
 }
 
@@ -83,8 +83,8 @@
 func (p sshFxpNamePacket) id() uint32   { return p.ID }
 
 // take raw incoming packet data and build packet objects
-func makePacket(p rxPacket) (packet, error) {
-	var pkt packet
+func makePacket(p rxPacket) (requestPacket, error) {
+	var pkt requestPacket
 	switch p.pktType {
 	case ssh_FXP_INIT:
 		pkt = &sshFxInitPacket{}

request-server.go

diff --git a/request-server.go b/request-server.go
index 1520530..95fdf3f 100644
--- a/request-server.go
+++ b/request-server.go
@@ -27,7 +27,7 @@
 type RequestServer struct {
 	serverConn
 	Handlers        Handlers
-	pktChan         chan packet
+	pktChan         chan requestPacket
 	openRequests    map[string]Request
 	openRequestLock sync.RWMutex
 	handleCount     int
@@ -44,7 +44,7 @@
 			},
 		},
 		Handlers:     h,
-		pktChan:      make(chan packet, sftpServerWorkerCount),
+		pktChan:      make(chan requestPacket, sftpServerWorkerCount),
 		openRequests: make(map[string]Request),
 	}
 }
@@ -166,7 +166,7 @@
 	}
 }
 
-func (rs *RequestServer) handle(request Request, pkt packet) responsePacket {
+func (rs *RequestServer) handle(request Request, pkt requestPacket) responsePacket {
 	// fmt.Println("Request Method: ", request.Method)
 	rpkt, err := request.handle(rs.Handlers)
 	if err != nil {

server.go

diff --git a/server.go b/server.go
index 3f21001..f0bbb8b 100644
--- a/server.go
+++ b/server.go
@@ -29,7 +29,7 @@
 	serverConn
 	debugStream   io.Writer
 	readOnly      bool
-	pktChan       chan packet
+	pktChan       chan requestPacket
 	openFiles     map[string]*os.File
 	openFilesLock sync.RWMutex
 	handleCount   int
@@ -83,7 +83,7 @@
 			},
 		},
 		debugStream: ioutil.Discard,
-		pktChan:     make(chan packet, sftpServerWorkerCount),
+		pktChan:     make(chan requestPacket, sftpServerWorkerCount),
 		openFiles:   make(map[string]*os.File),
 		maxTxPacket: 1 << 15,
 	}
@@ -292,7 +292,7 @@
 	}
 
 	var err error
-	var pkt packet
+	var pkt requestPacket
 	var pktType uint8
 	var pktBytes []byte
 	for {