github/golang.net
2
0
Fork 0
mirror of https://github.com/golang/net.git synced 2026-03-31 18:37:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

icmp: fix ListenPacket shadowing bug.

Browse Source 
Change-Id: I78c9a2e06da5269140212996842ac2e885d2746c
Reviewed-on: https://go-review.googlesource.com/10561
Reviewed-by: David Symonds <dsymonds@golang.org>
This commit is contained in:
Nigel Tao
2015-06-01 13:36:28 +10:00
parent 589db58a47
commit a74a067234
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
icmp/listen_posix.go
View File

@@ -57,7 +57,7 @@ func ListenPacket(network, address string) (*PacketConn, error) {
proto = iana.ProtocolIPv6ICMP
}
}
var err error
var cerr error
var c net.PacketConn
switch family {
case syscall.AF_INET, syscall.AF_INET6:
@@ -80,12 +80,12 @@ func ListenPacket(network, address string) (*PacketConn, error) {
}
f := os.NewFile(uintptr(s), "datagram-oriented icmp")
defer f.Close()
c, err = net.FilePacketConn(f)
c, cerr = net.FilePacketConn(f)
default:
c, err = net.ListenPacket(network, address)
c, cerr = net.ListenPacket(network, address)
}
if err != nil {
return nil, err
if cerr != nil {
return nil, cerr
}
switch proto {
case iana.ProtocolICMP: