From: Dave Cheney <dave@cheney.net>
Date: Wed, 30 Nov 2011 22:14:03 +0000 (-0500)
Subject: undo CL 5436056 / 03560deae933
X-Git-Tag: weekly.2011-12-01~6
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0e62c75b9d6e96a24c5a0a933c6a634a4595d62a;p=gostls13.git

undo CL 5436056 / 03560deae933

Remove the accidentally exported net.Listener

««« original CL description
exp/ssh: remove unused forwarding methods in Server Listener

R=agl, rsc
CC=golang-dev
https://golang.org/cl/5436056

»»»

R=agl, rsc
CC=golang-dev
https://golang.org/cl/5437090
---

diff --git a/src/pkg/exp/ssh/server.go b/src/pkg/exp/ssh/server.go
index 11d77235c6..428a747e1e 100644
--- a/src/pkg/exp/ssh/server.go
+++ b/src/pkg/exp/ssh/server.go
@@ -636,15 +636,15 @@ func (s *ServerConn) Accept() (Channel, error) {
 
 // A Listener implements a network listener (net.Listener) for SSH connections.
 type Listener struct {
-	net.Listener
-	config *ServerConfig
+	listener net.Listener
+	config   *ServerConfig
 }
 
 // Accept waits for and returns the next incoming SSH connection.
 // The receiver should call Handshake() in another goroutine 
 // to avoid blocking the accepter.
 func (l *Listener) Accept() (*ServerConn, error) {
-	c, err := l.Listener.Accept()
+	c, err := l.listener.Accept()
 	if err != nil {
 		return nil, err
 	}
@@ -652,6 +652,16 @@ func (l *Listener) Accept() (*ServerConn, error) {
 	return conn, nil
 }
 
+// Addr returns the listener's network address.
+func (l *Listener) Addr() net.Addr {
+	return l.listener.Addr()
+}
+
+// Close closes the listener.
+func (l *Listener) Close() error {
+	return l.listener.Close()
+}
+
 // Listen creates an SSH listener accepting connections on
 // the given network address using net.Listen.
 func Listen(network, addr string, config *ServerConfig) (*Listener, error) {