qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 11:04:56 -07:00
Code Releases Activity

net: move cgo address info flags to per-platform files

Browse Source 
Move address info flags to per-platform files. This is needed to
enable cgo on NetBSD (and later OpenBSD), as some of the currently
used AI_* defines do not exist on these platforms.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/6250075
This commit is contained in:
Joel Sing 2012-06-03 23:54:14 +10:00
parent 8801402940
commit eb4138f481
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pkg/net/cgo_bsd.go
View File

@ -11,6 +11,6 @@ package net
*/
import "C"
func cgoAddrInfoMask() C.int {
return C.AI_MASK
func cgoAddrInfoFlags() C.int {
return C.AI_CANONNAME | C.AI_V4MAPPED | C.AI_ALL
}

8
src/pkg/net/cgo_linux.go
View File

@ -9,6 +9,12 @@ package net
*/
import "C"
func cgoAddrInfoMask() C.int {
func cgoAddrInfoFlags() C.int {
// NOTE(rsc): In theory there are approximately balanced
// arguments for and against including AI_ADDRCONFIG
// in the flags (it includes IPv4 results only on IPv4 systems,
// and similarly for IPv6), but in practice setting it causes
// getaddrinfo to return the wrong canonical name on Linux.
// So definitely leave it out.
return C.AI_CANONNAME | C.AI_V4MAPPED | C.AI_ALL
}

8
src/pkg/net/cgo_unix.go
View File

@ -81,13 +81,7 @@ func cgoLookupIPCNAME(name string) (addrs []IP, cname string, err error, complet
var res *C.struct_addrinfo
var hints C.struct_addrinfo
// NOTE(rsc): In theory there are approximately balanced
// arguments for and against including AI_ADDRCONFIG
// in the flags (it includes IPv4 results only on IPv4 systems,
// and similarly for IPv6), but in practice setting it causes
// getaddrinfo to return the wrong canonical name on Linux.
// So definitely leave it out.
hints.ai_flags = (C.AI_ALL | C.AI_V4MAPPED | C.AI_CANONNAME) & cgoAddrInfoMask()
hints.ai_flags = cgoAddrInfoFlags()
h := C.CString(name)
defer C.free(unsafe.Pointer(h))