From ed40a6cc352d9acfba912aae191023ebdc0461d1 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 16 Oct 2013 14:24:28 +1100 Subject: [PATCH] go.crypto/ssh: move channelForwardMsg declaration. R=golang-dev, dave CC=golang-dev https://golang.org/cl/14669046 --- ssh/tcpip.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ssh/tcpip.go b/ssh/tcpip.go index 4ee4d1b..3ff444e 100644 --- a/ssh/tcpip.go +++ b/ssh/tcpip.go @@ -27,14 +27,6 @@ func (c *ClientConn) Listen(n, addr string) (net.Listener, error) { return c.ListenTCP(laddr) } -// RFC 4254 7.1 -type channelForwardMsg struct { - Message string - WantReply bool - raddr string - rport uint32 -} - // Automatic port allocation is broken with OpenSSH before 6.0. See // also https://bugzilla.mindrot.org/show_bug.cgi?id=2017. In // particular, OpenSSH 5.9 sends a channelOpenMsg with port number 0, @@ -83,6 +75,14 @@ func (c *ClientConn) autoPortListenWorkaround(laddr *net.TCPAddr) (net.Listener, return nil, fmt.Errorf("ssh: listen on random port failed after %d tries: %v", tries, err) } +// RFC 4254 7.1 +type channelForwardMsg struct { + Message string + WantReply bool + raddr string + rport uint32 +} + // ListenTCP requests the remote peer open a listening socket // on laddr. Incoming connections will be available by calling // Accept on the returned net.Listener.