net: make protocol-specific Dial and Listen return consistent error value

cixtor · cixtor · commit e4bb139e75bf · 2013-08-28T19:51:02.000+09:00
Update #4856 R=golang-dev, bradfitz, dave CC=golang-dev https://golang.org/cl/12916046
diff --git a/src/pkg/net/iprawsock_posix.go b/src/pkg/net/iprawsock_posix.go
@@ -189,19 +189,19 @@ func DialIP(netProto string, laddr, raddr *IPAddr) (*IPConn, error) {
 func dialIP(netProto string, laddr, raddr *IPAddr, deadline time.Time) (*IPConn, error) {
 	net, proto, err := parseNetwork(netProto)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "dial", Net: netProto, Addr: raddr, Err: err}
 	}
 	switch net {
 	case "ip", "ip4", "ip6":
 	default:
-		return nil, UnknownNetworkError(netProto)
+		return nil, &OpError{Op: "dial", Net: netProto, Addr: raddr, Err: UnknownNetworkError(netProto)}
 	}
 	if raddr == nil {
-		return nil, &OpError{"dial", netProto, nil, errMissingAddress}
+		return nil, &OpError{Op: "dial", Net: netProto, Addr: nil, Err: errMissingAddress}
 	}
 	fd, err := internetSocket(net, laddr, raddr, deadline, syscall.SOCK_RAW, proto, "dial", sockaddrToIP)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "dial", Net: netProto, Addr: raddr, Err: err}
 	}
 	return newIPConn(fd), nil
 }
@@ -213,16 +213,16 @@ func dialIP(netProto string, laddr, raddr *IPAddr, deadline time.Time) (*IPConn,
 func ListenIP(netProto string, laddr *IPAddr) (*IPConn, error) {
 	net, proto, err := parseNetwork(netProto)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "dial", Net: netProto, Addr: laddr, Err: err}
 	}
 	switch net {
 	case "ip", "ip4", "ip6":
 	default:
-		return nil, UnknownNetworkError(netProto)
+		return nil, &OpError{Op: "listen", Net: netProto, Addr: laddr, Err: UnknownNetworkError(netProto)}
 	}
 	fd, err := internetSocket(net, laddr, nil, noDeadline, syscall.SOCK_RAW, proto, "listen", sockaddrToIP)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "listen", Net: netProto, Addr: laddr, Err: err}
 	}
 	return newIPConn(fd), nil
 }
diff --git a/src/pkg/net/ipsock_posix.go b/src/pkg/net/ipsock_posix.go
@@ -133,18 +133,7 @@ func favoriteAddrFamily(net string, laddr, raddr sockaddr, mode string) (family
 
 func internetSocket(net string, laddr, raddr sockaddr, deadline time.Time, sotype, proto int, mode string, toAddr func(syscall.Sockaddr) Addr) (fd *netFD, err error) {
 	family, ipv6only := favoriteAddrFamily(net, laddr, raddr, mode)
-	fd, err = socket(net, family, sotype, proto, ipv6only, laddr, raddr, deadline, toAddr)
-	if err != nil {
-		goto Error
-	}
-	return fd, nil
-
-Error:
-	addr := raddr
-	if mode == "listen" {
-		addr = laddr
-	}
-	return nil, &OpError{mode, net, addr, err}
+	return socket(net, family, sotype, proto, ipv6only, laddr, raddr, deadline, toAddr)
 }
 
 func ipToSockaddr(family int, ip IP, port int, zone string) (syscall.Sockaddr, error) {
diff --git a/src/pkg/net/tcpsock_posix.go b/src/pkg/net/tcpsock_posix.go
@@ -150,10 +150,10 @@ func DialTCP(net string, laddr, raddr *TCPAddr) (*TCPConn, error) {
 	switch net {
 	case "tcp", "tcp4", "tcp6":
 	default:
-		return nil, UnknownNetworkError(net)
+		return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: UnknownNetworkError(net)}
 	}
 	if raddr == nil {
-		return nil, &OpError{"dial", net, nil, errMissingAddress}
+		return nil, &OpError{Op: "dial", Net: net, Addr: nil, Err: errMissingAddress}
 	}
 	return dialTCP(net, laddr, raddr, noDeadline)
 }
@@ -193,7 +193,7 @@ func dialTCP(net string, laddr, raddr *TCPAddr, deadline time.Time) (*TCPConn, e
 	}
 
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: err}
 	}
 	return newTCPConn(fd), nil
 }
@@ -292,14 +292,14 @@ func ListenTCP(net string, laddr *TCPAddr) (*TCPListener, error) {
 	switch net {
 	case "tcp", "tcp4", "tcp6":
 	default:
-		return nil, UnknownNetworkError(net)
+		return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: UnknownNetworkError(net)}
 	}
 	if laddr == nil {
 		laddr = &TCPAddr{}
 	}
 	fd, err := internetSocket(net, laddr, nil, noDeadline, syscall.SOCK_STREAM, 0, "listen", sockaddrToTCP)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: err}
 	}
 	return &TCPListener{fd}, nil
 }
diff --git a/src/pkg/net/udpsock_posix.go b/src/pkg/net/udpsock_posix.go
@@ -173,18 +173,18 @@ func DialUDP(net string, laddr, raddr *UDPAddr) (*UDPConn, error) {
 	switch net {
 	case "udp", "udp4", "udp6":
 	default:
-		return nil, UnknownNetworkError(net)
+		return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: UnknownNetworkError(net)}
 	}
 	if raddr == nil {
-		return nil, &OpError{"dial", net, nil, errMissingAddress}
+		return nil, &OpError{Op: "dial", Net: net, Addr: nil, Err: errMissingAddress}
 	}
 	return dialUDP(net, laddr, raddr, noDeadline)
 }
 
 func dialUDP(net string, laddr, raddr *UDPAddr, deadline time.Time) (*UDPConn, error) {
 	fd, err := internetSocket(net, laddr, raddr, deadline, syscall.SOCK_DGRAM, 0, "dial", sockaddrToUDP)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: err}
 	}
 	return newUDPConn(fd), nil
 }
@@ -200,14 +200,14 @@ func ListenUDP(net string, laddr *UDPAddr) (*UDPConn, error) {
 	switch net {
 	case "udp", "udp4", "udp6":
 	default:
-		return nil, UnknownNetworkError(net)
+		return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: UnknownNetworkError(net)}
 	}
 	if laddr == nil {
 		laddr = &UDPAddr{}
 	}
 	fd, err := internetSocket(net, laddr, nil, noDeadline, syscall.SOCK_DGRAM, 0, "listen", sockaddrToUDP)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: err}
 	}
 	return newUDPConn(fd), nil
 }
@@ -220,25 +220,25 @@ func ListenMulticastUDP(net string, ifi *Interface, gaddr *UDPAddr) (*UDPConn, e
 	switch net {
 	case "udp", "udp4", "udp6":
 	default:
-		return nil, UnknownNetworkError(net)
+		return nil, &OpError{Op: "listen", Net: net, Addr: gaddr, Err: UnknownNetworkError(net)}
 	}
 	if gaddr == nil || gaddr.IP == nil {
-		return nil, &OpError{"listen", net, nil, errMissingAddress}
+		return nil, &OpError{Op: "listen", Net: net, Addr: nil, Err: errMissingAddress}
 	}
 	fd, err := internetSocket(net, gaddr, nil, noDeadline, syscall.SOCK_DGRAM, 0, "listen", sockaddrToUDP)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "listen", Net: net, Addr: gaddr, Err: err}
 	}
 	c := newUDPConn(fd)
 	if ip4 := gaddr.IP.To4(); ip4 != nil {
 		if err := listenIPv4MulticastUDP(c, ifi, ip4); err != nil {
 			c.Close()
-			return nil, &OpError{"listen", net, &IPAddr{IP: ip4}, err}
+			return nil, &OpError{Op: "listen", Net: net, Addr: &IPAddr{IP: ip4}, Err: err}
 		}
 	} else {
 		if err := listenIPv6MulticastUDP(c, ifi, gaddr.IP); err != nil {
 			c.Close()
-			return nil, &OpError{"listen", net, &IPAddr{IP: gaddr.IP}, err}
+			return nil, &OpError{Op: "listen", Net: net, Addr: &IPAddr{IP: gaddr.IP}, Err: err}
 		}
 	}
 	return c, nil
diff --git a/src/pkg/net/unixsock_posix.go b/src/pkg/net/unixsock_posix.go
@@ -35,7 +35,7 @@ func unixSocket(net string, laddr, raddr sockaddr, mode string, deadline time.Ti
 			raddr = nil
 		}
 		if raddr == nil && (sotype != syscall.SOCK_DGRAM || laddr == nil) {
-			return nil, &OpError{Op: mode, Net: net, Err: errMissingAddress}
+			return nil, errMissingAddress
 		}
 	case "listen":
 	default:
@@ -51,17 +51,9 @@ func unixSocket(net string, laddr, raddr sockaddr, mode string, deadline time.Ti
 
 	fd, err := socket(net, syscall.AF_UNIX, sotype, 0, false, laddr, raddr, deadline, f)
 	if err != nil {
-		goto error
+		return nil, err
 	}
 	return fd, nil
-
-error:
-	addr := raddr
-	switch mode {
-	case "listen":
-		addr = laddr
-	}
-	return nil, &OpError{Op: mode, Net: net, Addr: addr, Err: err}
 }
 
 func sockaddrToUnix(sa syscall.Sockaddr) Addr {
@@ -250,15 +242,15 @@ func DialUnix(net string, laddr, raddr *UnixAddr) (*UnixConn, error) {
 	switch net {
 	case "unix", "unixgram", "unixpacket":
 	default:
-		return nil, UnknownNetworkError(net)
+		return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: UnknownNetworkError(net)}
 	}
 	return dialUnix(net, laddr, raddr, noDeadline)
 }
 
 func dialUnix(net string, laddr, raddr *UnixAddr, deadline time.Time) (*UnixConn, error) {
 	fd, err := unixSocket(net, laddr, raddr, "dial", deadline)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: err}
 	}
 	return newUnixConn(fd), nil
 }
@@ -277,14 +269,14 @@ func ListenUnix(net string, laddr *UnixAddr) (*UnixListener, error) {
 	switch net {
 	case "unix", "unixpacket":
 	default:
-		return nil, UnknownNetworkError(net)
+		return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: UnknownNetworkError(net)}
 	}
 	if laddr == nil {
-		return nil, &OpError{"listen", net, nil, errMissingAddress}
+		return nil, &OpError{Op: "listen", Net: net, Addr: nil, Err: errMissingAddress}
 	}
 	fd, err := unixSocket(net, laddr, nil, "listen", noDeadline)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: err}
 	}
 	return &UnixListener{fd, laddr.Name}, nil
 }
@@ -365,14 +357,14 @@ func ListenUnixgram(net string, laddr *UnixAddr) (*UnixConn, error) {
 	switch net {
 	case "unixgram":
 	default:
-		return nil, UnknownNetworkError(net)
+		return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: UnknownNetworkError(net)}
 	}
 	if laddr == nil {
-		return nil, &OpError{"listen", net, nil, errMissingAddress}
+		return nil, &OpError{Op: "listen", Net: net, Addr: nil, Err: errMissingAddress}
 	}
 	fd, err := unixSocket(net, laddr, nil, "listen", noDeadline)
 	if err != nil {
-		return nil, err
+		return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: err}
 	}
 	return newUnixConn(fd), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -189,19 +189,19 @@ func DialIP(netProto string, laddr, raddr IPAddr) (IPConn, error) {`
`189`	`189`	`func dialIP(netProto string, laddr, raddr IPAddr, deadline time.Time) (IPConn, error) {`
`190`	`190`	`net, proto, err := parseNetwork(netProto)`
`191`	`191`	`if err != nil {`
`192`		`- return nil, err`
	`192`	`+ return nil, &OpError{Op: "dial", Net: netProto, Addr: raddr, Err: err}`
`193`	`193`	`}`
`194`	`194`	`switch net {`
`195`	`195`	`case "ip", "ip4", "ip6":`
`196`	`196`	`default:`
`197`		`- return nil, UnknownNetworkError(netProto)`
	`197`	`+ return nil, &OpError{Op: "dial", Net: netProto, Addr: raddr, Err: UnknownNetworkError(netProto)}`
`198`	`198`	`}`
`199`	`199`	`if raddr == nil {`
`200`		`- return nil, &OpError{"dial", netProto, nil, errMissingAddress}`
	`200`	`+ return nil, &OpError{Op: "dial", Net: netProto, Addr: nil, Err: errMissingAddress}`
`201`	`201`	`}`
`202`	`202`	`fd, err := internetSocket(net, laddr, raddr, deadline, syscall.SOCK_RAW, proto, "dial", sockaddrToIP)`
`203`	`203`	`if err != nil {`
`204`		`- return nil, err`
	`204`	`+ return nil, &OpError{Op: "dial", Net: netProto, Addr: raddr, Err: err}`
`205`	`205`	`}`
`206`	`206`	`return newIPConn(fd), nil`
`207`	`207`	`}`
`@@ -213,16 +213,16 @@ func dialIP(netProto string, laddr, raddr IPAddr, deadline time.Time) (IPConn,`
`213`	`213`	`func ListenIP(netProto string, laddr IPAddr) (IPConn, error) {`
`214`	`214`	`net, proto, err := parseNetwork(netProto)`
`215`	`215`	`if err != nil {`
`216`		`- return nil, err`
	`216`	`+ return nil, &OpError{Op: "dial", Net: netProto, Addr: laddr, Err: err}`
`217`	`217`	`}`
`218`	`218`	`switch net {`
`219`	`219`	`case "ip", "ip4", "ip6":`
`220`	`220`	`default:`
`221`		`- return nil, UnknownNetworkError(netProto)`
	`221`	`+ return nil, &OpError{Op: "listen", Net: netProto, Addr: laddr, Err: UnknownNetworkError(netProto)}`
`222`	`222`	`}`
`223`	`223`	`fd, err := internetSocket(net, laddr, nil, noDeadline, syscall.SOCK_RAW, proto, "listen", sockaddrToIP)`
`224`	`224`	`if err != nil {`
`225`		`- return nil, err`
	`225`	`+ return nil, &OpError{Op: "listen", Net: netProto, Addr: laddr, Err: err}`
`226`	`226`	`}`
`227`	`227`	`return newIPConn(fd), nil`
`228`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,10 +150,10 @@ func DialTCP(net string, laddr, raddr TCPAddr) (TCPConn, error) {`
`150`	`150`	`switch net {`
`151`	`151`	`case "tcp", "tcp4", "tcp6":`
`152`	`152`	`default:`
`153`		`- return nil, UnknownNetworkError(net)`
	`153`	`+ return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: UnknownNetworkError(net)}`
`154`	`154`	`}`
`155`	`155`	`if raddr == nil {`
`156`		`- return nil, &OpError{"dial", net, nil, errMissingAddress}`
	`156`	`+ return nil, &OpError{Op: "dial", Net: net, Addr: nil, Err: errMissingAddress}`
`157`	`157`	`}`
`158`	`158`	`return dialTCP(net, laddr, raddr, noDeadline)`
`159`	`159`	`}`
`@@ -193,7 +193,7 @@ func dialTCP(net string, laddr, raddr TCPAddr, deadline time.Time) (TCPConn, e`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`if err != nil {`
`196`		`- return nil, err`
	`196`	`+ return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: err}`
`197`	`197`	`}`
`198`	`198`	`return newTCPConn(fd), nil`
`199`	`199`	`}`
`@@ -292,14 +292,14 @@ func ListenTCP(net string, laddr TCPAddr) (TCPListener, error) {`
`292`	`292`	`switch net {`
`293`	`293`	`case "tcp", "tcp4", "tcp6":`
`294`	`294`	`default:`
`295`		`- return nil, UnknownNetworkError(net)`
	`295`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: UnknownNetworkError(net)}`
`296`	`296`	`}`
`297`	`297`	`if laddr == nil {`
`298`	`298`	`laddr = &TCPAddr{}`
`299`	`299`	`}`
`300`	`300`	`fd, err := internetSocket(net, laddr, nil, noDeadline, syscall.SOCK_STREAM, 0, "listen", sockaddrToTCP)`
`301`	`301`	`if err != nil {`
`302`		`- return nil, err`
	`302`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: err}`
`303`	`303`	`}`
`304`	`304`	`return &TCPListener{fd}, nil`
`305`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,18 +173,18 @@ func DialUDP(net string, laddr, raddr UDPAddr) (UDPConn, error) {`
`173`	`173`	`switch net {`
`174`	`174`	`case "udp", "udp4", "udp6":`
`175`	`175`	`default:`
`176`		`- return nil, UnknownNetworkError(net)`
	`176`	`+ return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: UnknownNetworkError(net)}`
`177`	`177`	`}`
`178`	`178`	`if raddr == nil {`
`179`		`- return nil, &OpError{"dial", net, nil, errMissingAddress}`
	`179`	`+ return nil, &OpError{Op: "dial", Net: net, Addr: nil, Err: errMissingAddress}`
`180`	`180`	`}`
`181`	`181`	`return dialUDP(net, laddr, raddr, noDeadline)`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`func dialUDP(net string, laddr, raddr UDPAddr, deadline time.Time) (UDPConn, error) {`
`185`	`185`	`fd, err := internetSocket(net, laddr, raddr, deadline, syscall.SOCK_DGRAM, 0, "dial", sockaddrToUDP)`
`186`	`186`	`if err != nil {`
`187`		`- return nil, err`
	`187`	`+ return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: err}`
`188`	`188`	`}`
`189`	`189`	`return newUDPConn(fd), nil`
`190`	`190`	`}`
`@@ -200,14 +200,14 @@ func ListenUDP(net string, laddr UDPAddr) (UDPConn, error) {`
`200`	`200`	`switch net {`
`201`	`201`	`case "udp", "udp4", "udp6":`
`202`	`202`	`default:`
`203`		`- return nil, UnknownNetworkError(net)`
	`203`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: UnknownNetworkError(net)}`
`204`	`204`	`}`
`205`	`205`	`if laddr == nil {`
`206`	`206`	`laddr = &UDPAddr{}`
`207`	`207`	`}`
`208`	`208`	`fd, err := internetSocket(net, laddr, nil, noDeadline, syscall.SOCK_DGRAM, 0, "listen", sockaddrToUDP)`
`209`	`209`	`if err != nil {`
`210`		`- return nil, err`
	`210`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: err}`
`211`	`211`	`}`
`212`	`212`	`return newUDPConn(fd), nil`
`213`	`213`	`}`
`@@ -220,25 +220,25 @@ func ListenMulticastUDP(net string, ifi Interface, gaddr UDPAddr) (*UDPConn, e`
`220`	`220`	`switch net {`
`221`	`221`	`case "udp", "udp4", "udp6":`
`222`	`222`	`default:`
`223`		`- return nil, UnknownNetworkError(net)`
	`223`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: gaddr, Err: UnknownNetworkError(net)}`
`224`	`224`	`}`
`225`	`225`	`if gaddr == nil \|\| gaddr.IP == nil {`
`226`		`- return nil, &OpError{"listen", net, nil, errMissingAddress}`
	`226`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: nil, Err: errMissingAddress}`
`227`	`227`	`}`
`228`	`228`	`fd, err := internetSocket(net, gaddr, nil, noDeadline, syscall.SOCK_DGRAM, 0, "listen", sockaddrToUDP)`
`229`	`229`	`if err != nil {`
`230`		`- return nil, err`
	`230`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: gaddr, Err: err}`
`231`	`231`	`}`
`232`	`232`	`c := newUDPConn(fd)`
`233`	`233`	`if ip4 := gaddr.IP.To4(); ip4 != nil {`
`234`	`234`	`if err := listenIPv4MulticastUDP(c, ifi, ip4); err != nil {`
`235`	`235`	`c.Close()`
`236`		`- return nil, &OpError{"listen", net, &IPAddr{IP: ip4}, err}`
	`236`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: &IPAddr{IP: ip4}, Err: err}`
`237`	`237`	`}`
`238`	`238`	`} else {`
`239`	`239`	`if err := listenIPv6MulticastUDP(c, ifi, gaddr.IP); err != nil {`
`240`	`240`	`c.Close()`
`241`		`- return nil, &OpError{"listen", net, &IPAddr{IP: gaddr.IP}, err}`
	`241`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: &IPAddr{IP: gaddr.IP}, Err: err}`
`242`	`242`	`}`
`243`	`243`	`}`
`244`	`244`	`return c, nil`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func unixSocket(net string, laddr, raddr sockaddr, mode string, deadline time.Ti`
`35`	`35`	`raddr = nil`
`36`	`36`	`}`
`37`	`37`	`if raddr == nil && (sotype != syscall.SOCK_DGRAM \|\| laddr == nil) {`
`38`		`- return nil, &OpError{Op: mode, Net: net, Err: errMissingAddress}`
	`38`	`+ return nil, errMissingAddress`
`39`	`39`	`}`
`40`	`40`	`case "listen":`
`41`	`41`	`default:`
`@@ -51,17 +51,9 @@ func unixSocket(net string, laddr, raddr sockaddr, mode string, deadline time.Ti`
`51`	`51`
`52`	`52`	`fd, err := socket(net, syscall.AF_UNIX, sotype, 0, false, laddr, raddr, deadline, f)`
`53`	`53`	`if err != nil {`
`54`		`- goto error`
	`54`	`+ return nil, err`
`55`	`55`	`}`
`56`	`56`	`return fd, nil`
`57`		`-`
`58`		`-error:`
`59`		`- addr := raddr`
`60`		`- switch mode {`
`61`		`- case "listen":`
`62`		`- addr = laddr`
`63`		`- }`
`64`		`- return nil, &OpError{Op: mode, Net: net, Addr: addr, Err: err}`
`65`	`57`	`}`
`66`	`58`
`67`	`59`	`func sockaddrToUnix(sa syscall.Sockaddr) Addr {`
`@@ -250,15 +242,15 @@ func DialUnix(net string, laddr, raddr UnixAddr) (UnixConn, error) {`
`250`	`242`	`switch net {`
`251`	`243`	`case "unix", "unixgram", "unixpacket":`
`252`	`244`	`default:`
`253`		`- return nil, UnknownNetworkError(net)`
	`245`	`+ return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: UnknownNetworkError(net)}`
`254`	`246`	`}`
`255`	`247`	`return dialUnix(net, laddr, raddr, noDeadline)`
`256`	`248`	`}`
`257`	`249`
`258`	`250`	`func dialUnix(net string, laddr, raddr UnixAddr, deadline time.Time) (UnixConn, error) {`
`259`	`251`	`fd, err := unixSocket(net, laddr, raddr, "dial", deadline)`
`260`	`252`	`if err != nil {`
`261`		`- return nil, err`
	`253`	`+ return nil, &OpError{Op: "dial", Net: net, Addr: raddr, Err: err}`
`262`	`254`	`}`
`263`	`255`	`return newUnixConn(fd), nil`
`264`	`256`	`}`
`@@ -277,14 +269,14 @@ func ListenUnix(net string, laddr UnixAddr) (UnixListener, error) {`
`277`	`269`	`switch net {`
`278`	`270`	`case "unix", "unixpacket":`
`279`	`271`	`default:`
`280`		`- return nil, UnknownNetworkError(net)`
	`272`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: UnknownNetworkError(net)}`
`281`	`273`	`}`
`282`	`274`	`if laddr == nil {`
`283`		`- return nil, &OpError{"listen", net, nil, errMissingAddress}`
	`275`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: nil, Err: errMissingAddress}`
`284`	`276`	`}`
`285`	`277`	`fd, err := unixSocket(net, laddr, nil, "listen", noDeadline)`
`286`	`278`	`if err != nil {`
`287`		`- return nil, err`
	`279`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: err}`
`288`	`280`	`}`
`289`	`281`	`return &UnixListener{fd, laddr.Name}, nil`
`290`	`282`	`}`
`@@ -365,14 +357,14 @@ func ListenUnixgram(net string, laddr UnixAddr) (UnixConn, error) {`
`365`	`357`	`switch net {`
`366`	`358`	`case "unixgram":`
`367`	`359`	`default:`
`368`		`- return nil, UnknownNetworkError(net)`
	`360`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: UnknownNetworkError(net)}`
`369`	`361`	`}`
`370`	`362`	`if laddr == nil {`
`371`		`- return nil, &OpError{"listen", net, nil, errMissingAddress}`
	`363`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: nil, Err: errMissingAddress}`
`372`	`364`	`}`
`373`	`365`	`fd, err := unixSocket(net, laddr, nil, "listen", noDeadline)`
`374`	`366`	`if err != nil {`
`375`		`- return nil, err`
	`367`	`+ return nil, &OpError{Op: "listen", Net: net, Addr: laddr, Err: err}`
`376`	`368`	`}`
`377`	`369`	`return newUnixConn(fd), nil`
`378`	`370`	`}`