From f98fd1f5ecec028d2635baf2e1ba93ee455c06cb Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 25 Apr 2016 16:07:37 +0200 Subject: [PATCH] x/crypto/ssh: if debugMux is set, also log global messages. Change-Id: I685ba7f30f1d2e2bc3c078c7bddb6d383a179113 Reviewed-on: https://go-review.googlesource.com/22416 Reviewed-by: Brad Fitzpatrick Run-TryBot: Han-Wen Nienhuys --- ssh/channel.go | 4 ++-- ssh/mux.go | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ssh/channel.go b/ssh/channel.go index 5403c7e..6671c98 100644 --- a/ssh/channel.go +++ b/ssh/channel.go @@ -217,7 +217,7 @@ func (c *channel) writePacket(packet []byte) error { func (c *channel) sendMessage(msg interface{}) error { if debugMux { - log.Printf("send %d: %#v", c.mux.chanList.offset, msg) + log.Printf("send(%d): %#v", c.mux.chanList.offset, msg) } p := Marshal(msg) @@ -371,7 +371,7 @@ func (c *channel) close() { close(c.msg) close(c.incomingRequests) c.writeMu.Lock() - // This is not necesary for a normal channel teardown, but if + // This is not necessary for a normal channel teardown, but if // there was another error, it is. c.sentClose = true c.writeMu.Unlock() diff --git a/ssh/mux.go b/ssh/mux.go index a2af7f4..fb54c8b 100644 --- a/ssh/mux.go +++ b/ssh/mux.go @@ -131,6 +131,9 @@ func newMux(p packetConn) *mux { func (m *mux) sendMessage(msg interface{}) error { p := Marshal(msg) + if debugMux { + log.Printf("send global(%d): %#v", m.chanList.offset, msg) + } return m.conn.writePacket(p) }