From: Adam Langley Date: Mon, 28 Dec 2009 19:40:01 +0000 (-0800) Subject: crypto/tls: make Listener a pointer. X-Git-Tag: weekly.2010-01-05~34 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3c6bf09539d787d635e332fd97d97998b4b9a3e1;p=gostls13.git crypto/tls: make Listener a pointer. Listener contains private members and 6g now enforces that private members cannot be assigned outside of their package. R=rsc CC=golang-dev https://golang.org/cl/183073 --- diff --git a/src/pkg/crypto/tls/tls.go b/src/pkg/crypto/tls/tls.go index 29d918e4b0..7c76ddeb9b 100644 --- a/src/pkg/crypto/tls/tls.go +++ b/src/pkg/crypto/tls/tls.go @@ -162,7 +162,7 @@ type Listener struct { config *Config } -func (l Listener) Accept() (c net.Conn, err os.Error) { +func (l *Listener) Accept() (c net.Conn, err os.Error) { c, err = l.listener.Accept() if err != nil { return @@ -172,13 +172,14 @@ func (l Listener) Accept() (c net.Conn, err os.Error) { return } -func (l Listener) Close() os.Error { return l.listener.Close() } +func (l *Listener) Close() os.Error { return l.listener.Close() } -func (l Listener) Addr() net.Addr { return l.listener.Addr() } +func (l *Listener) Addr() net.Addr { return l.listener.Addr() } // NewListener creates a Listener which accepts connections from an inner // Listener and wraps each connection with Server. -func NewListener(listener net.Listener, config *Config) (l Listener) { +func NewListener(listener net.Listener, config *Config) (l *Listener) { + l = new(Listener) l.listener = listener l.config = config return