syscall: Fill out GNU/Linux support.

[pf3gnuchains/gcc-fork.git] / libgo / go / syscall / lsf_linux.go

diff --git a/libgo/go/syscall/lsf_linux.go b/libgo/go/syscall/lsf_linux.go
index f2bd2b7..5296cec 100644 (file)
--- a/libgo/go/syscall/lsf_linux.go
+++ b/libgo/go/syscall/lsf_linux.go
@@ -18,10 +18,10 @@ func LsfJump(code, k, jt, jf int) *SockFilter {
        return &SockFilter{Code: uint16(code), Jt: uint8(jt), Jf: uint8(jf), K: uint32(k)}
 }
 
-func LsfSocket(ifindex, proto int) (int, int) {
+func LsfSocket(ifindex, proto int) (int, error) {
        var lsall SockaddrLinklayer
        s, e := Socket(AF_PACKET, SOCK_RAW, proto)
-       if e != 0 {
+       if e != nil {
                return 0, e
        }
        p := (*[2]byte)(unsafe.Pointer(&lsall.Protocol))
@@ -29,11 +29,11 @@ func LsfSocket(ifindex, proto int) (int, int) {
        p[1] = byte(proto)
        lsall.Ifindex = ifindex
        e = Bind(s, &lsall)
-       if e != 0 {
+       if e != nil {
                Close(s)
                return 0, e
        }
-       return s, 0
+       return s, nil
 }
 
 type iflags struct {
@@ -41,17 +41,17 @@ type iflags struct {
        flags uint16
 }
 
-func SetLsfPromisc(name string, m bool) int {
+func SetLsfPromisc(name string, m bool) error {
        s, e := Socket(AF_INET, SOCK_DGRAM, 0)
-       if e != 0 {
+       if e != nil {
                return e
        }
        defer Close(s)
        var ifl iflags
        copy(ifl.name[:], []byte(name))
        _, _, ep := Syscall(SYS_IOCTL, uintptr(s), SIOCGIFFLAGS, uintptr(unsafe.Pointer(&ifl)))
-       if e := int(ep); e != 0 {
-               return e
+       if ep != 0 {
+               return Errno(ep)
        }
        if m {
                ifl.flags |= uint16(IFF_PROMISC)
@@ -59,20 +59,20 @@ func SetLsfPromisc(name string, m bool) int {
                ifl.flags &= ^uint16(IFF_PROMISC)
        }
        _, _, ep = Syscall(SYS_IOCTL, uintptr(s), SIOCSIFFLAGS, uintptr(unsafe.Pointer(&ifl)))
-       if e := int(ep); e != 0 {
-               return e
+       if ep != 0 {
+               return Errno(ep)
        }
-       return 0
+       return nil
 }
 
-func AttachLsf(fd int, i []SockFilter) int {
+func AttachLsf(fd int, i []SockFilter) error {
        var p SockFprog
        p.Len = uint16(len(i))
        p.Filter = (*SockFilter)(unsafe.Pointer(&i[0]))
-       return setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, uintptr(unsafe.Pointer(&p)), unsafe.Sizeof(p))
+       return setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, (*byte)(unsafe.Pointer(&p)), Socklen_t(unsafe.Sizeof(p)))
 }
 
-func DetachLsf(fd int) int {
+func DetachLsf(fd int) error {
        var dummy int
-       return setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, uintptr(unsafe.Pointer(&dummy)), unsafe.Sizeof(dummy))
+       return setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, (*byte)(unsafe.Pointer(&dummy)), Socklen_t(unsafe.Sizeof(dummy)))
 }