aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMikio Hara <mikioh.mikioh@gmail.com>2013-01-19 23:13:01 +0900
committerMikio Hara <mikioh.mikioh@gmail.com>2013-01-19 23:13:01 +0900
commit3454b6bf82a7f09aa346594a5a71b1dfed3696d8 (patch)
tree2c6707ccea1338edfb770995be65602bae9e43dd /src
parent254caaf90bdd3d20739c445a77b2a5e6cfc05371 (diff)
downloadgo-3454b6bf82a7f09aa346594a5a71b1dfed3696d8.tar.xz
undo CL 5687057 / 58bc8aae4abb
Fortunately we have never seen the panic on sockaddrToTCP in the past year. ««« original CL description net: panic if sockaddrToTCP returns nil incorrectly Part of diagnosing the selfConnect bug TBR=dsymonds R=golang-dev CC=golang-dev https://golang.org/cl/5687057 »»» R=golang-dev, minux.ma CC=golang-dev https://golang.org/cl/7137063
Diffstat (limited to 'src')
-rw-r--r--src/pkg/net/tcpsock_posix.go5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/pkg/net/tcpsock_posix.go b/src/pkg/net/tcpsock_posix.go
index 4f9159566f..bd5a2a2877 100644
--- a/src/pkg/net/tcpsock_posix.go
+++ b/src/pkg/net/tcpsock_posix.go
@@ -26,11 +26,6 @@ func sockaddrToTCP(sa syscall.Sockaddr) Addr {
return &TCPAddr{IP: sa.Addr[0:], Port: sa.Port}
case *syscall.SockaddrInet6:
return &TCPAddr{IP: sa.Addr[0:], Port: sa.Port, Zone: zoneToString(int(sa.ZoneId))}
- default:
- if sa != nil {
- // Diagnose when we will turn a non-nil sockaddr into a nil.
- panic("unexpected type in sockaddrToTCP")
- }
}
return nil
}