code review 5433063: exp/ssh: messages now contain remote channel's id inste...

src/pkg/exp/ssh/client.go

 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package ssh
 
 import (
         "crypto"
         "crypto/rand"
         "errors"
@@ skipping 320 matching lines @@
                 data:         make(chan []byte, 16),
                 dataExt:      make(chan []byte, 16),
                 win:          make(chan int, 16),
                 msg:          make(chan interface{}, 16),
         }
 }
 
 // Close closes the channel. This does not close the underlying connection.
 func (c *clientChan) Close() error {
         return c.writePacket(marshal(msgChannelClose, channelCloseMsg{
                 PeersId: c.peersId,

[dave_cheney.net, 2011/11/24 15:18:27]

boy is my face red.

         }))
 }
 
 // Thread safe channel list.
 type chanlist struct {
         // protects concurrent access to chans
         sync.Mutex
         // chans are indexed by the local id of the channel, clientChan.id.
         // The PeersId value of messages received by ClientConn.mainloop is
         // used to locate the right local clientChan in this slice.
@@ skipping 25 matching lines @@
 
 func (c *chanlist) remove(id uint32) {
         c.Lock()
         defer c.Unlock()
         c.chans[int(id)] = nil
 }
 
 // A chanWriter represents the stdin of a remote process.
 type chanWriter struct {
         win          chan int // receives window adjustments
-        id           uint32   // this channel's id

[dave_cheney.net, 2011/11/24 15:18:27]

Drop id

-        peersId      uint32   // the server channel's id

[dave_cheney.net, 2011/11/24 15:18:27]

the peers id.

+        peersId      uint32   // the peers id
         rwin         int      // current rwin size
         packetWriter          // for sending channelDataMsg
 }
 
 // Write writes data to the remote process's standard input.
 func (w *chanWriter) Write(data []byte) (n int, err error) {
         for {
                 if w.rwin == 0 {
                         win, ok := <-w.win
                         if !ok {
@@ skipping 17 matching lines @@
 func (w *chanWriter) Close() error {
         return w.writePacket(marshal(msgChannelEOF, channelEOFMsg{w.peersId}))
 }
 
 // A chanReader represents stdout or stderr of a remote process.
 type chanReader struct {
         // TODO(dfc) a fixed size channel may not be the right data structure.
         // If writes to this channel block, they will block mainLoop, making
         // it unable to receive new messages from the remote side.
         data         chan []byte // receives data from remote
-        id           uint32      // this channel's id

[dave_cheney.net, 2011/11/24 15:18:27]

drop id

-        peersId      uint32      // the server channel's id

[dave_cheney.net, 2011/11/24 15:18:27]

see above

+        peersId      uint32      // the peers id
         packetWriter             // for sending windowAdjustMsg
         buf          []byte
 }
 
 // Read reads data from the remote process's stdout or stderr.
 func (r *chanReader) Read(data []byte) (int, error) {
         var ok bool
         for {
                 if len(r.buf) > 0 {
                         n := copy(data, r.buf)
                         r.buf = r.buf[n:]
                         msg := windowAdjustMsg{
                                 PeersId:         r.peersId,
                                 AdditionalBytes: uint32(n),
                         }
                         return n, r.writePacket(marshal(msgChannelWindowAdjust, msg))
                 }
                 r.buf, ok = <-r.data
                 if !ok {
                         return 0, io.EOF
                 }
         }
         panic("unreachable")
 }
-
-func (r *chanReader) Close() error {
-        return r.writePacket(marshal(msgChannelEOF, channelEOFMsg{r.peersId}))
-}

[dave_cheney.net, 2011/11/24 15:18:27]

nit: you can delete this method if you like. It is not currently used.