Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

allow Listen on ":9999" as an alias for "0.0.0.0:9999"

Browse source 
R=r
DELTA=21  (12 added, 0 deleted, 9 changed)
OCL=21653
CL=21653
This commit is contained in:
Russ Cox 2008-12-19 15:52:21 -08:00
parent 4f3506b4ee
commit 33907d1346
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/lib/net/net.go
View file

@ -41,7 +41,7 @@ func SplitHostPort(hostport string) (host, port string, err *os.Error) {
port = hostport[i+1:len(hostport)]; port = hostport[i+1:len(hostport)];
// Can put brackets around host ... // Can put brackets around host ...
if host[0] == '[' && host[len(host)-1] == ']' { if len(host) > 0 && host[0] == '[' && host[len(host)-1] == ']' {
host = host[1:len(host)-1] host = host[1:len(host)-1]
} else { } else {
// ... but if there are no brackets, no colons. // ... but if there are no brackets, no colons.
@ -65,15 +65,26 @@ func JoinHostPort(host, port string) string {
// Convert "host:port" into IP address and port. // Convert "host:port" into IP address and port.
// For now, host and port must be numeric literals. // For now, host and port must be numeric literals.
// Eventually, we'll have name resolution. // Eventually, we'll have name resolution.
func HostPortToIP(net string, hostport string) (ip []byte, iport int, err *os.Error) { func HostPortToIP(net, hostport, mode string) (ip []byte, iport int, err *os.Error) {
var host, port string; var host, port string;
host, port, err = SplitHostPort(hostport); host, port, err = SplitHostPort(hostport);
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
var addr []byte;
if host == "" {
if mode == "listen" {
addr = IPnoaddr; // wildcard - listen to all
} else {
return nil, 0, MissingAddress;
}
}
// Try as an IP address. // Try as an IP address.
addr := ParseIP(host); if addr == nil {
addr = ParseIP(host);
}
if addr == nil { if addr == nil {
// Not an IP address. Try as a DNS name. // Not an IP address. Try as a DNS name.
hostname, addrs, err := LookupHost(host); hostname, addrs, err := LookupHost(host);
@ -279,20 +290,20 @@ func (c *ConnBase) SetLinger(sec int) *os.Error {
// PreferIPv4 here should fall back to the IPv4 socket interface when possible. // PreferIPv4 here should fall back to the IPv4 socket interface when possible.
const PreferIPv4 = false const PreferIPv4 = false
func InternetSocket(net, laddr, raddr string, proto int64) (fd *FD, err *os.Error) { func InternetSocket(net, laddr, raddr string, proto int64, mode string) (fd *FD, err *os.Error) {
// Parse addresses (unless they are empty). // Parse addresses (unless they are empty).
var lip, rip []byte; var lip, rip []byte;
var lport, rport int; var lport, rport int;
var lerr, rerr *os.Error; var lerr, rerr *os.Error;
if laddr != "" { if laddr != "" {
lip, lport, lerr = HostPortToIP(net, laddr); lip, lport, lerr = HostPortToIP(net, laddr, mode);
if lerr != nil { if lerr != nil {
return nil, lerr return nil, lerr
} }
} }
if raddr != "" { if raddr != "" {
rip, rport, rerr = HostPortToIP(net, raddr); rip, rport, rerr = HostPortToIP(net, raddr, mode);
if rerr != nil { if rerr != nil {
return nil, rerr return nil, rerr
} }
@ -370,7 +381,7 @@ export func DialTCP(net, laddr, raddr string) (c *ConnTCP, err *os.Error) {
if raddr == "" { if raddr == "" {
return nil, MissingAddress return nil, MissingAddress
} }
fd, e := InternetSocket(net, laddr, raddr, syscall.SOCK_STREAM); fd, e := InternetSocket(net, laddr, raddr, syscall.SOCK_STREAM, "dial");
if e != nil { if e != nil {
return nil, e return nil, e
} }
@ -397,7 +408,7 @@ export func DialUDP(net, laddr, raddr string) (c *ConnUDP, err *os.Error) {
if raddr == "" { if raddr == "" {
return nil, MissingAddress return nil, MissingAddress
} }
fd, e := InternetSocket(net, laddr, raddr, syscall.SOCK_DGRAM); fd, e := InternetSocket(net, laddr, raddr, syscall.SOCK_DGRAM, "dial");
if e != nil { if e != nil {
return nil, e return nil, e
} }
@ -477,7 +488,7 @@ export type ListenerTCP struct {
} }
export func ListenTCP(net, laddr string) (l *ListenerTCP, err *os.Error) { export func ListenTCP(net, laddr string) (l *ListenerTCP, err *os.Error) {
fd, e := InternetSocket(net, laddr, "", syscall.SOCK_STREAM); fd, e := InternetSocket(net, laddr, "", syscall.SOCK_STREAM, "listen");
if e != nil { if e != nil {
return nil, e return nil, e
} }

1
src/lib/net/tcpserver_test.go
View file

@ -79,6 +79,7 @@ export func TestTcpServer(t *testing.T) {
DoTest(t, "tcp", "0.0.0.0:9997", "127.0.0.1:9997"); DoTest(t, "tcp", "0.0.0.0:9997", "127.0.0.1:9997");
DoTest(t, "tcp", "[::]:9997", "[::ffff:127.0.0.1]:9997"); DoTest(t, "tcp", "[::]:9997", "[::ffff:127.0.0.1]:9997");
DoTest(t, "tcp", "[::]:9997", "127.0.0.1:9997"); DoTest(t, "tcp", "[::]:9997", "127.0.0.1:9997");
DoTest(t, "tcp", ":9997", "127.0.0.1:9997");
DoTest(t, "tcp", "0.0.0.0:9997", "[::ffff:127.0.0.1]:9997"); DoTest(t, "tcp", "0.0.0.0:9997", "[::ffff:127.0.0.1]:9997");
} }