undo CL 107280044 / ee11f19bc514
preparing for the syscall package freeze.
««« original CL description
syscall: consolidate, simplify socket options for Unix-like systems
Also exposes common socket option functions on Solaris.
Update #7174
Update #7175
LGTM=aram
R=golang-codereviews, aram
CC=golang-codereviews
https://golang.org/cl/107280044
»»»
LGTM=r
R=r
CC=golang-codereviews
https://golang.org/cl/121880043
diff --git a/src/pkg/syscall/syscall_unix.go b/src/pkg/syscall/syscall_unix.go
index 699a8fd..b288915 100644
--- a/src/pkg/syscall/syscall_unix.go
+++ b/src/pkg/syscall/syscall_unix.go
@@ -207,6 +207,13 @@
return anyToSockaddr(&rsa)
}
+func GetsockoptInt(fd, level, opt int) (value int, err error) {
+ var n int32
+ vallen := _Socklen(4)
+ err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
+ return int(n), err
+}
+
func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, err error) {
var rsa RawSockaddrAny
var len _Socklen = SizeofSockaddrAny
@@ -227,73 +234,24 @@
return sendto(fd, p, flags, ptr, n)
}
-func GetsockoptByte(fd, level, opt int) (byte, error) {
- var v byte
- l := _Socklen(1)
- err := getsockopt(fd, level, opt, unsafe.Pointer(&v), &l)
- return v, err
-}
-
-func GetsockoptInt(fd, level, opt int) (int, error) {
- var v int32
- l := _Socklen(4)
- err := getsockopt(fd, level, opt, unsafe.Pointer(&v), &l)
- return int(v), err
-}
-
-func GetsockoptInet4Addr(fd, level, opt int) ([4]byte, error) {
- var v [4]byte
- l := _Socklen(4)
- err := getsockopt(fd, level, opt, unsafe.Pointer(&v[0]), &l)
- return v, err
-}
-
-func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
- var v IPMreq
- l := _Socklen(SizeofIPMreq)
- err := getsockopt(fd, level, opt, unsafe.Pointer(&v), &l)
- return &v, err
-}
-
-func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
- var v IPv6Mreq
- l := _Socklen(SizeofIPv6Mreq)
- err := getsockopt(fd, level, opt, unsafe.Pointer(&v), &l)
- return &v, err
-}
-
-func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
- var v IPv6MTUInfo
- l := _Socklen(SizeofIPv6MTUInfo)
- err := getsockopt(fd, level, opt, unsafe.Pointer(&v), &l)
- return &v, err
-}
-
-func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
- var v ICMPv6Filter
- l := _Socklen(SizeofICMPv6Filter)
- err := getsockopt(fd, level, opt, unsafe.Pointer(&v), &l)
- return &v, err
-}
-
-func SetsockoptByte(fd, level, opt int, value byte) error {
+func SetsockoptByte(fd, level, opt int, value byte) (err error) {
return setsockopt(fd, level, opt, unsafe.Pointer(&value), 1)
}
-func SetsockoptInt(fd, level, opt int, value int) error {
- n := int32(value)
+func SetsockoptInt(fd, level, opt int, value int) (err error) {
+ var n = int32(value)
return setsockopt(fd, level, opt, unsafe.Pointer(&n), 4)
}
-func SetsockoptInet4Addr(fd, level, opt int, value [4]byte) error {
+func SetsockoptInet4Addr(fd, level, opt int, value [4]byte) (err error) {
return setsockopt(fd, level, opt, unsafe.Pointer(&value[0]), 4)
}
-func SetsockoptIPMreq(fd, level, opt int, mreq *IPMreq) error {
+func SetsockoptIPMreq(fd, level, opt int, mreq *IPMreq) (err error) {
return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPMreq)
}
-func SetsockoptIPv6Mreq(fd, level, opt int, mreq *IPv6Mreq) error {
+func SetsockoptIPv6Mreq(fd, level, opt int, mreq *IPv6Mreq) (err error) {
return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPv6Mreq)
}
@@ -301,15 +259,15 @@
return setsockopt(fd, level, opt, unsafe.Pointer(filter), SizeofICMPv6Filter)
}
-func SetsockoptLinger(fd, level, opt int, l *Linger) error {
+func SetsockoptLinger(fd, level, opt int, l *Linger) (err error) {
return setsockopt(fd, level, opt, unsafe.Pointer(l), SizeofLinger)
}
-func SetsockoptString(fd, level, opt int, s string) error {
+func SetsockoptString(fd, level, opt int, s string) (err error) {
return setsockopt(fd, level, opt, unsafe.Pointer(&[]byte(s)[0]), uintptr(len(s)))
}
-func SetsockoptTimeval(fd, level, opt int, tv *Timeval) error {
+func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (err error) {
return setsockopt(fd, level, opt, unsafe.Pointer(tv), unsafe.Sizeof(*tv))
}
