From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Tue, 16 Aug 2011 20:53:09 +0000 (-0400)
Subject: net: return correct local address for an accepted TCP connection
X-Git-Tag: weekly.2011-08-17~30
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c20ced956ece23a5e8f1d5b6e48ad9ba8e8c5d05;p=gostls13.git

net: return correct local address for an accepted TCP connection

Fixes #2127.

R=rsc
CC=golang-dev
https://golang.org/cl/4873043
---

diff --git a/src/pkg/net/fd.go b/src/pkg/net/fd.go
index cd1a21dc36..fd39d858c3 100644
--- a/src/pkg/net/fd.go
+++ b/src/pkg/net/fd.go
@@ -591,13 +591,13 @@ func (fd *netFD) accept(toAddr func(syscall.Sockaddr) Addr) (nfd *netFD, err os.
 	// because we have put fd.sysfd into non-blocking mode.
 	syscall.ForkLock.RLock()
 	var s, e int
-	var sa syscall.Sockaddr
+	var rsa syscall.Sockaddr
 	for {
 		if fd.closing {
 			syscall.ForkLock.RUnlock()
 			return nil, os.EINVAL
 		}
-		s, sa, e = syscall.Accept(fd.sysfd)
+		s, rsa, e = syscall.Accept(fd.sysfd)
 		if e != syscall.EAGAIN {
 			break
 		}
@@ -616,7 +616,8 @@ func (fd *netFD) accept(toAddr func(syscall.Sockaddr) Addr) (nfd *netFD, err os.
 		syscall.Close(s)
 		return nil, err
 	}
-	nfd.setAddr(fd.laddr, toAddr(sa))
+	lsa, _ := syscall.Getsockname(nfd.sysfd)
+	nfd.setAddr(toAddr(lsa), toAddr(rsa))
 	return nfd, nil
 }