summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/pkg/net/net.go18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/pkg/net/net.go b/src/pkg/net/net.go
index 5e6ba8c20..2f145a72c 100644
--- a/src/pkg/net/net.go
+++ b/src/pkg/net/net.go
@@ -134,7 +134,11 @@ func Dial(net, laddr, raddr string) (c Conn, err os.Error) {
goto Error
}
}
- return DialTCP(net, la, ra)
+ c, err := DialTCP(net, la, ra)
+ if err != nil {
+ return nil, err
+ }
+ return c, nil
case "udp", "udp4", "upd6":
var la, ra *UDPAddr
if laddr != "" {
@@ -147,7 +151,11 @@ func Dial(net, laddr, raddr string) (c Conn, err os.Error) {
goto Error
}
}
- return DialUDP(net, la, ra)
+ c, err := DialUDP(net, la, ra)
+ if err != nil {
+ return nil, err
+ }
+ return c, nil
case "unix", "unixgram":
var la, ra *UnixAddr
if raddr != "" {
@@ -160,7 +168,11 @@ func Dial(net, laddr, raddr string) (c Conn, err os.Error) {
goto Error
}
}
- return DialUnix(net, la, ra)
+ c, err = DialUnix(net, la, ra)
+ if err != nil {
+ return nil, err
+ }
+ return c, nil
}
err = UnknownNetworkError(net)
Error: