diff options
Diffstat (limited to 'libgo/go/syscall/socket.go')
| -rw-r--r-- | libgo/go/syscall/socket.go | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/libgo/go/syscall/socket.go b/libgo/go/syscall/socket.go index 973759086ce..819e70a46d3 100644 --- a/libgo/go/syscall/socket.go +++ b/libgo/go/syscall/socket.go @@ -132,7 +132,7 @@ func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) { } //sys accept(fd int, sa *RawSockaddrAny, len *Socklen_t) (nfd int, err error) -//accept(fd int, sa *RawSockaddrAny, len *Socklen_t) int +//accept(fd _C_int, sa *RawSockaddrAny, len *Socklen_t) _C_int func Accept(fd int) (nfd int, sa Sockaddr, err error) { var rsa RawSockaddrAny @@ -150,7 +150,7 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) { } //sysnb getsockname(fd int, sa *RawSockaddrAny, len *Socklen_t) (err error) -//getsockname(fd int, sa *RawSockaddrAny, len *Socklen_t) int +//getsockname(fd _C_int, sa *RawSockaddrAny, len *Socklen_t) _C_int func Getsockname(fd int) (sa Sockaddr, err error) { var rsa RawSockaddrAny @@ -162,7 +162,7 @@ func Getsockname(fd int) (sa Sockaddr, err error) { } //sysnb getpeername(fd int, sa *RawSockaddrAny, len *Socklen_t) (err error) -//getpeername(fd int, sa *RawSockaddrAny, len *Socklen_t) int +//getpeername(fd _C_int, sa *RawSockaddrAny, len *Socklen_t) _C_int func Getpeername(fd int) (sa Sockaddr, err error) { var rsa RawSockaddrAny @@ -174,7 +174,7 @@ func Getpeername(fd int) (sa Sockaddr, err error) { } //sys bind(fd int, sa *RawSockaddrAny, len Socklen_t) (err error) -//bind(fd int, sa *RawSockaddrAny, len Socklen_t) int +//bind(fd _C_int, sa *RawSockaddrAny, len Socklen_t) _C_int func Bind(fd int, sa Sockaddr) (err error) { ptr, n, err := sa.sockaddr() @@ -185,7 +185,7 @@ func Bind(fd int, sa Sockaddr) (err error) { } //sys connect(s int, addr *RawSockaddrAny, addrlen Socklen_t) (err error) -//connect(s int, addr *RawSockaddrAny, addrlen Socklen_t) int +//connect(s _C_int, addr *RawSockaddrAny, addrlen Socklen_t) _C_int func Connect(fd int, sa Sockaddr) (err error) { ptr, n, err := sa.sockaddr() @@ -196,7 +196,7 @@ func Connect(fd int, sa Sockaddr) (err error) { } //sysnb socket(domain int, typ int, proto int) (fd int, err error) -//socket(domain int, typ int, protocol int) int +//socket(domain _C_int, typ _C_int, protocol _C_int) _C_int func Socket(domain, typ, proto int) (fd int, err error) { if domain == AF_INET6 && SocketDisableIPv6 { @@ -206,16 +206,21 @@ func Socket(domain, typ, proto int) (fd int, err error) { return } -//sysnb socketpair(domain int, typ int, proto int, fd *[2]int) (err error) -//socketpair(domain int, typ int, protocol int, fd *[2]int) int +//sysnb socketpair(domain int, typ int, proto int, fd *[2]_C_int) (err error) +//socketpair(domain _C_int, typ _C_int, protocol _C_int, fd *[2]_C_int) _C_int func Socketpair(domain, typ, proto int) (fd [2]int, err error) { - err = socketpair(domain, typ, proto, &fd) + var fdx [2]_C_int + err = socketpair(domain, typ, proto, &fdx) + if err == nil { + fd[0] = int(fdx[0]) + fd[1] = int(fdx[1]) + } return } //sys getsockopt(s int, level int, name int, val uintptr, vallen *Socklen_t) (err error) -//getsockopt(s int, level int, name int, val *byte, vallen *Socklen_t) int +//getsockopt(s _C_int, level _C_int, name _C_int, val *byte, vallen *Socklen_t) _C_int func GetsockoptByte(fd, level, opt int) (value byte, err error) { var n byte @@ -259,7 +264,7 @@ func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) { } //sys setsockopt(s int, level int, name int, val *byte, vallen Socklen_t) (err error) -//setsockopt(s int, level int, optname int, val *byte, vallen Socklen_t) int +//setsockopt(s _C_int, level _C_int, optname _C_int, val *byte, vallen Socklen_t) _C_int func SetsockoptByte(fd, level, opt int, value byte) (err error) { var n = byte(value) @@ -305,7 +310,7 @@ func SetsockoptString(fd, level, opt int, s string) (err error) { } //sys recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *Socklen_t) (n int, err error) -//recvfrom(fd int, buf *byte, len Size_t, flags int, from *RawSockaddrAny, fromlen *Socklen_t) Ssize_t +//recvfrom(fd _C_int, buf *byte, len Size_t, flags _C_int, from *RawSockaddrAny, fromlen *Socklen_t) Ssize_t func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, err error) { var rsa RawSockaddrAny @@ -318,7 +323,7 @@ func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, err error) { } //sys sendto(s int, buf []byte, flags int, to *RawSockaddrAny, tolen Socklen_t) (err error) -//sendto(s int, buf *byte, len Size_t, flags int, to *RawSockaddrAny, tolen Socklen_t) Ssize_t +//sendto(s _C_int, buf *byte, len Size_t, flags _C_int, to *RawSockaddrAny, tolen Socklen_t) Ssize_t func Sendto(fd int, p []byte, flags int, to Sockaddr) (err error) { ptr, n, err := to.sockaddr() @@ -329,7 +334,7 @@ func Sendto(fd int, p []byte, flags int, to Sockaddr) (err error) { } //sys recvmsg(s int, msg *Msghdr, flags int) (n int, err error) -//recvmsg(s int, msg *Msghdr, flags int) Ssize_t +//recvmsg(s _C_int, msg *Msghdr, flags _C_int) Ssize_t func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) { var msg Msghdr @@ -366,7 +371,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from } //sys sendmsg(s int, msg *Msghdr, flags int) (err error) -//sendmsg(s int, msg *Msghdr, flags int) Ssize_t +//sendmsg(s _C_int, msg *Msghdr, flags _C_int) Ssize_t func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) { var ptr *RawSockaddrAny @@ -405,10 +410,10 @@ func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) { } //sys Listen(fd int, n int) (err error) -//listen(fd int, n int) int +//listen(fd _C_int, n _C_int) _C_int //sys Shutdown(fd int, how int) (err error) -//shutdown(fd int, how int) int +//shutdown(fd _C_int, how _C_int) _C_int func (iov *Iovec) SetLen(length int) { iov.Len = Iovec_len_t(length) |