github/golang.net
2
0
Fork 0
mirror of https://github.com/golang/net.git synced 2026-03-31 18:37:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

ipv6: remove unnecessary sysSockoptLen type

Browse Source 
Change-Id: I87887ea03c36ca7d26e1ab2cb55d723611c942a8
Reviewed-on: https://go-review.googlesource.com/21354
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Mikio Hara
2016-03-30 09:22:35 +09:00
parent 37db164db4
commit c4bb2f7b3d
9 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ipv6/sockopt_ssmreq_unix.go
View File

@@ -21,7 +21,7 @@ func setsockoptGroupReq(fd int, opt *sockOpt, ifi *net.Interface, grp net.IP) er
}
gr.setGroup(grp)
var p unsafe.Pointer
var l sysSockoptLen
var l uint32
if freebsd32o64 {
var d [sysSizeofGroupReq + 4]byte
s := (*[sysSizeofGroupReq]byte)(unsafe.Pointer(&gr))
@@ -43,7 +43,7 @@ func setsockoptGroupSourceReq(fd int, opt *sockOpt, ifi *net.Interface, grp, src
}
gsr.setSourceGroup(grp, src)
var p unsafe.Pointer
var l sysSockoptLen
var l uint32
if freebsd32o64 {
var d [sysSizeofGroupSourceReq + 4]byte
s := (*[sysSizeofGroupSourceReq]byte)(unsafe.Pointer(&gsr))

12
ipv6/sockopt_unix.go
View File

@@ -17,7 +17,7 @@ func getInt(fd int, opt *sockOpt) (int, error) {
return 0, errOpNoSupport
}
var i int32
l := sysSockoptLen(4)
l := uint32(4)
if err := getsockopt(fd, opt.level, opt.name, unsafe.Pointer(&i), &l); err != nil {
return 0, os.NewSyscallError("getsockopt", err)
}
@@ -29,7 +29,7 @@ func setInt(fd int, opt *sockOpt, v int) error {
return errOpNoSupport
}
i := int32(v)
return os.NewSyscallError("setsockopt", setsockopt(fd, opt.level, opt.name, unsafe.Pointer(&i), sysSockoptLen(4)))
return os.NewSyscallError("setsockopt", setsockopt(fd, opt.level, opt.name, unsafe.Pointer(&i), 4))
}
func getInterface(fd int, opt *sockOpt) (*net.Interface, error) {
@@ -37,7 +37,7 @@ func getInterface(fd int, opt *sockOpt) (*net.Interface, error) {
return nil, errOpNoSupport
}
var i int32
l := sysSockoptLen(4)
l := uint32(4)
if err := getsockopt(fd, opt.level, opt.name, unsafe.Pointer(&i), &l); err != nil {
return nil, os.NewSyscallError("getsockopt", err)
}
@@ -59,7 +59,7 @@ func setInterface(fd int, opt *sockOpt, ifi *net.Interface) error {
if ifi != nil {
i = int32(ifi.Index)
}
return os.NewSyscallError("setsockopt", setsockopt(fd, opt.level, opt.name, unsafe.Pointer(&i), sysSockoptLen(4)))
return os.NewSyscallError("setsockopt", setsockopt(fd, opt.level, opt.name, unsafe.Pointer(&i), 4))
}
func getICMPFilter(fd int, opt *sockOpt) (*ICMPFilter, error) {
@@ -67,7 +67,7 @@ func getICMPFilter(fd int, opt *sockOpt) (*ICMPFilter, error) {
return nil, errOpNoSupport
}
var f ICMPFilter
l := sysSockoptLen(sysSizeofICMPv6Filter)
l := uint32(sysSizeofICMPv6Filter)
if err := getsockopt(fd, opt.level, opt.name, unsafe.Pointer(&f.sysICMPv6Filter), &l); err != nil {
return nil, os.NewSyscallError("getsockopt", err)
}
@@ -86,7 +86,7 @@ func getMTUInfo(fd int, opt *sockOpt) (*net.Interface, int, error) {
return nil, 0, errOpNoSupport
}
var mi sysIPv6Mtuinfo
l := sysSockoptLen(sysSizeofIPv6Mtuinfo)
l := uint32(sysSizeofIPv6Mtuinfo)
if err := getsockopt(fd, opt.level, opt.name, unsafe.Pointer(&mi), &l); err != nil {
return nil, 0, os.NewSyscallError("getsockopt", err)
}

2
ipv6/sys_bsd.go
View File

@@ -13,8 +13,6 @@ import (
"golang.org/x/net/internal/iana"
)
type sysSockoptLen int32
var (
ctlOpts = [ctlMax]ctlOpt{
ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},

2
ipv6/sys_darwin.go
View File

@@ -12,8 +12,6 @@ import (
"golang.org/x/net/internal/iana"
)
type sysSockoptLen int32
var (
ctlOpts = [ctlMax]ctlOpt{
ctlHopLimit: {sysIPV6_2292HOPLIMIT, 4, marshal2292HopLimit, parseHopLimit},

2
ipv6/sys_freebsd.go
View File

@@ -14,8 +14,6 @@ import (
"golang.org/x/net/internal/iana"
)
type sysSockoptLen int32
var (
ctlOpts = [ctlMax]ctlOpt{
ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},

2
ipv6/sys_linux.go
View File

@@ -12,8 +12,6 @@ import (
"golang.org/x/net/internal/iana"
)
type sysSockoptLen int32
var (
ctlOpts = [ctlMax]ctlOpt{
ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},

2
ipv6/sys_stub.go
View File

@@ -6,8 +6,6 @@
package ipv6
type sysSockoptLen int32
var (
ctlOpts = [ctlMax]ctlOpt{}

4
ipv6/syscall_linux_386.go
View File

@@ -16,14 +16,14 @@ const (
func socketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (int, syscall.Errno)
func getsockopt(fd, level, name int, v unsafe.Pointer, l *sysSockoptLen) error {
func getsockopt(fd, level, name int, v unsafe.Pointer, l *uint32) error {
if _, errno := socketcall(sysGETSOCKOPT, uintptr(fd), uintptr(level), uintptr(name), uintptr(v), uintptr(unsafe.Pointer(l)), 0); errno != 0 {
return error(errno)
}
return nil
}
func setsockopt(fd, level, name int, v unsafe.Pointer, l sysSockoptLen) error {
func setsockopt(fd, level, name int, v unsafe.Pointer, l uint32) error {
if _, errno := socketcall(sysSETSOCKOPT, uintptr(fd), uintptr(level), uintptr(name), uintptr(v), uintptr(l), 0); errno != 0 {
return error(errno)
}

4
ipv6/syscall_unix.go
View File

@@ -11,14 +11,14 @@ import (
"unsafe"
)
func getsockopt(fd, level, name int, v unsafe.Pointer, l *sysSockoptLen) error {
func getsockopt(fd, level, name int, v unsafe.Pointer, l *uint32) error {
if _, _, errno := syscall.Syscall6(syscall.SYS_GETSOCKOPT, uintptr(fd), uintptr(level), uintptr(name), uintptr(v), uintptr(unsafe.Pointer(l)), 0); errno != 0 {
return error(errno)
}
return nil
}
func setsockopt(fd, level, name int, v unsafe.Pointer, l sysSockoptLen) error {
func setsockopt(fd, level, name int, v unsafe.Pointer, l uint32) error {
if _, _, errno := syscall.Syscall6(syscall.SYS_SETSOCKOPT, uintptr(fd), uintptr(level), uintptr(name), uintptr(v), uintptr(l), 0); errno != 0 {
return error(errno)
}