code review 12916046: net: make protocol-specific Dial and Listen return cons...

src/pkg/net/iprawsock_posix.go

 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // +build darwin dragonfly freebsd linux netbsd openbsd windows
 
 package net
 
 import (
         "syscall"
@@ skipping 171 matching lines @@
 // DialIP connects to the remote address raddr on the network protocol
 // netProto, which must be "ip", "ip4", or "ip6" followed by a colon
 // and a protocol number or name.
 func DialIP(netProto string, laddr, raddr *IPAddr) (*IPConn, error) {
         return dialIP(netProto, laddr, raddr, noDeadline)
 }
 
 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
 }
 
 // ListenIP listens for incoming IP packets addressed to the local
 // address laddr.  The returned connection's ReadFrom and WriteTo
 // methods can be used to receive and send IP packets with per-packet
 // addressing.
 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
 }