qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 14:54:43 -07:00
Code Releases Activity

net: break up and simplify Dial a bit

Browse Source 
No API or functional change.

R=jacek.masiulaniec, mikioh.mikioh, rsc
CC=golang-dev
https://golang.org/cl/4630081
This commit is contained in:
Brad Fitzpatrick 2011-06-29 21:56:13 -07:00
parent de36d19dfb
commit 73896bdc85
1 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/pkg/net/dial.go
View File

@ -6,6 +6,28 @@ package net
import "os" import "os"
func resolveNetAddr(op, net, addr string) (a Addr, err os.Error) {
if addr == "" {
return nil, &OpError{op, net, nil, errMissingAddress}
}
switch net {
case "tcp", "tcp4", "tcp6":
a, err = ResolveTCPAddr(net, addr)
case "udp", "udp4", "udp6":
a, err = ResolveUDPAddr(net, addr)
case "unix", "unixgram", "unixpacket":
a, err = ResolveUnixAddr(net, addr)
case "ip", "ip4", "ip6":
a, err = ResolveIPAddr(net, addr)
default:
err = UnknownNetworkError(net)
}
if err != nil {
return nil, &OpError{op, net + " " + addr, nil, err}
}
return
}
// Dial connects to the address addr on the network net. // Dial connects to the address addr on the network net.
// //
// Known networks are "tcp", "tcp4" (IPv4-only), "tcp6" (IPv6-only), // Known networks are "tcp", "tcp4" (IPv4-only), "tcp6" (IPv6-only),
@ -23,56 +45,26 @@ import "os"
// Dial("tcp", "[de:ad:be:ef::ca:fe]:80") // Dial("tcp", "[de:ad:be:ef::ca:fe]:80")
// //
func Dial(net, addr string) (c Conn, err os.Error) { func Dial(net, addr string) (c Conn, err os.Error) {
raddr := addr addri, err := resolveNetAddr("dial", net, addr)
if raddr == "" { if err != nil {
return nil, &OpError{"dial", net, nil, errMissingAddress} return nil, err
} }
switch net { switch ra := addri.(type) {
case "tcp", "tcp4", "tcp6": case *TCPAddr:
var ra *TCPAddr c, err = DialTCP(net, nil, ra)
if ra, err = ResolveTCPAddr(net, raddr); err != nil { case *UDPAddr:
goto Error c, err = DialUDP(net, nil, ra)
} case *UnixAddr:
c, err := DialTCP(net, nil, ra)
if err != nil {
return nil, err
}
return c, nil
case "udp", "udp4", "udp6":
var ra *UDPAddr
if ra, err = ResolveUDPAddr(net, raddr); err != nil {
goto Error
}
c, err := DialUDP(net, nil, ra)
if err != nil {
return nil, err
}
return c, nil
case "unix", "unixgram", "unixpacket":
var ra *UnixAddr
if ra, err = ResolveUnixAddr(net, raddr); err != nil {
goto Error
}
c, err = DialUnix(net, nil, ra) c, err = DialUnix(net, nil, ra)
if err != nil { case *IPAddr:
return nil, err c, err = DialIP(net, nil, ra)
} default:
return c, nil err = UnknownNetworkError(net)
case "ip", "ip4", "ip6":
var ra *IPAddr
if ra, err = ResolveIPAddr(net, raddr); err != nil {
goto Error
}
c, err := DialIP(net, nil, ra)
if err != nil {
return nil, err
}
return c, nil
} }
err = UnknownNetworkError(net) if err != nil {
Error: return nil, &OpError{"dial", net + " " + addr, nil, err}
return nil, &OpError{"dial", net + " " + raddr, nil, err} }
return
} }
// Listen announces on the local network address laddr. // Listen announces on the local network address laddr.