undo CL 104290043 / 1d13818e6b3d
preparing for the syscall package freeze.
««« original CL description
syscall: add source-specific multicast socket options for FreeBSD
Update #8266
LGTM=iant
R=golang-codereviews, iant
CC=golang-codereviews
https://golang.org/cl/104290043
»»»
LGTM=r
R=r
CC=golang-codereviews
https://golang.org/cl/113660043
diff --git a/src/pkg/syscall/syscall_freebsd.go b/src/pkg/syscall/syscall_freebsd.go
index 685ed2b..959d46b 100644
--- a/src/pkg/syscall/syscall_freebsd.go
+++ b/src/pkg/syscall/syscall_freebsd.go
@@ -93,36 +93,14 @@
}
func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
- var v IPMreqn
- l := _Socklen(SizeofIPMreqn)
- err := getsockopt(fd, level, opt, unsafe.Pointer(&v), &l)
- return &v, err
+ var value IPMreqn
+ vallen := _Socklen(SizeofIPMreqn)
+ errno := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+ return &value, errno
}
-func GetsockoptGroupReq(fd, level, opt int) (*GroupReq, error) {
- var v GroupReq
- l := _Socklen(SizeofGroupReq)
- err := getsockopt(fd, level, opt, unsafe.Pointer(&v), &l)
- return &v, err
-}
-
-func GetsockoptGroupSourceReq(fd, level, opt int) (*GroupSourceReq, error) {
- var v GroupSourceReq
- l := _Socklen(SizeofGroupSourceReq)
- err := getsockopt(fd, level, opt, unsafe.Pointer(&v), &l)
- return &v, err
-}
-
-func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) error {
- return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPMreqn)
-}
-
-func SetsockoptGroupReq(fd, level, opt int, greq *GroupReq) error {
- return setsockopt(fd, level, opt, unsafe.Pointer(greq), SizeofGroupReq)
-}
-
-func SetsockoptGroupSourceReq(fd, level, opt int, gsreq *GroupSourceReq) error {
- return setsockopt(fd, level, opt, unsafe.Pointer(gsreq), SizeofGroupSourceReq)
+func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
+ return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
}
func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
