OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

syscall: Support socket control messages.

Browse Source 
From-SVN: r183745
This commit is contained in:
Ian Lance Taylor 2012-01-30 23:57:42 +00:00
parent 842f302e91
commit 4a1a859611
5 changed files with 71 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libgo/Makefile.am
View File

@ -1593,6 +1593,13 @@ else # !LIBGO_IS_SOLARIS
syscall_uname_file = go/syscall/libcall_uname.go
endif
# GNU/Linux specific socket control messages.
if LIBGO_IS_LINUX
syscall_sockcmsg_file = go/syscall/sockcmsg_linux.go
else
syscall_sockcmsg_file =
endif
# Support for netlink sockets and messages.
if LIBGO_IS_LINUX
syscall_netlink_file = go/syscall/netlink_linux.go
@ -1606,8 +1613,10 @@ go_base_syscall_files = \
go/syscall/libcall_support.go \
go/syscall/libcall_posix.go \
go/syscall/socket.go \
go/syscall/sockcmsg_unix.go \
go/syscall/str.go \
go/syscall/syscall.go \
$(syscall_sockcmsg_file) \
$(syscall_syscall_file) \
$(syscall_exec_file) \
$(syscall_exec_os_file) \

6
libgo/Makefile.in
View File

@ -1923,6 +1923,10 @@ go_unicode_utf8_files = \
# 32-bit Solaris 2/x86 needs _nuname, handled in libcall_solaris_386.go.
@LIBGO_IS_386_TRUE@@LIBGO_IS_SOLARIS_TRUE@syscall_uname_file =
@LIBGO_IS_SOLARIS_FALSE@syscall_uname_file = go/syscall/libcall_uname.go
@LIBGO_IS_LINUX_FALSE@syscall_sockcmsg_file =
# GNU/Linux specific socket control messages.
@LIBGO_IS_LINUX_TRUE@syscall_sockcmsg_file = go/syscall/sockcmsg_linux.go
@LIBGO_IS_LINUX_FALSE@syscall_netlink_file =
# Support for netlink sockets and messages.
@ -1933,8 +1937,10 @@ go_base_syscall_files = \
go/syscall/libcall_support.go \
go/syscall/libcall_posix.go \
go/syscall/socket.go \
go/syscall/sockcmsg_unix.go \
go/syscall/str.go \
go/syscall/syscall.go \
$(syscall_sockcmsg_file) \
$(syscall_syscall_file) \
$(syscall_exec_file) \
$(syscall_exec_os_file) \

6
libgo/go/syscall/sockcmsg_unix.go
View File

@ -14,7 +14,7 @@ import (
// Round the length of a raw sockaddr up to align it propery.
func cmsgAlignOf(salen int) int {
salign := sizeofPtr
salign := int(sizeofPtr)
// NOTE: It seems like 64-bit Darwin kernel still requires 32-bit
// aligned access to BSD subsystem.
if darwinAMD64 {
@ -39,7 +39,7 @@ func CmsgSpace(datalen int) int {
}
func cmsgData(cmsg *Cmsghdr) unsafe.Pointer {
return unsafe.Pointer(uintptr(unsafe.Pointer(cmsg)) + SizeofCmsghdr)
return unsafe.Pointer(uintptr(unsafe.Pointer(cmsg)) + uintptr(SizeofCmsghdr))
}
type SocketControlMessage struct {
@ -72,7 +72,7 @@ func ParseSocketControlMessage(buf []byte) ([]SocketControlMessage, error) {
func socketControlMessageHeaderAndData(buf []byte) (*Cmsghdr, []byte, error) {
h := (*Cmsghdr)(unsafe.Pointer(&buf[0]))
if h.Len < SizeofCmsghdr || int(h.Len) > len(buf) {
if int(h.Len) < SizeofCmsghdr || int(h.Len) > len(buf) {
return nil, nil, EINVAL
}
return h, buf[cmsgAlignOf(SizeofCmsghdr):], nil

14
libgo/go/syscall/socket.go
View File

@ -40,7 +40,7 @@ func (sa *SockaddrInet4) sockaddr() (*RawSockaddrAny, Socklen_t, error) {
sa.raw.Family = AF_INET
n := sa.raw.setLen()
p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
p[0] = byte(sa.Port>>8)
p[0] = byte(sa.Port >> 8)
p[1] = byte(sa.Port)
for i := 0; i < len(sa.Addr); i++ {
sa.raw.Addr[i] = sa.Addr[i]
@ -62,7 +62,7 @@ func (sa *SockaddrInet6) sockaddr() (*RawSockaddrAny, Socklen_t, error) {
sa.raw.Family = AF_INET6
n := sa.raw.setLen()
p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
p[0] = byte(sa.Port>>8)
p[0] = byte(sa.Port >> 8)
p[1] = byte(sa.Port)
sa.raw.Scope_id = sa.ZoneId
for i := 0; i < len(sa.Addr); i++ {
@ -268,12 +268,12 @@ func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (err error) {
}
type Linger struct {
Onoff int32;
Linger int32;
Onoff int32
Linger int32
}
func SetsockoptLinger(fd, level, opt int, l *Linger) (err error) {
return setsockopt(fd, level, opt, (*byte)(unsafe.Pointer(l)), Socklen_t(unsafe.Sizeof(*l)));
return setsockopt(fd, level, opt, (*byte)(unsafe.Pointer(l)), Socklen_t(unsafe.Sizeof(*l)))
}
func SetsockoptIPMreq(fd, level, opt int, mreq *IPMreq) (err error) {
@ -405,3 +405,7 @@ func (iov *Iovec) SetLen(length int) {
func (msghdr *Msghdr) SetControllen(length int) {
msghdr.Controllen = Msghdr_controllen_t(length)
}
func (cmsg *Cmsghdr) SetLen(length int) {
cmsg.Len = Cmsghdr_len_t(length)
}

37
libgo/mksysinfo.sh
View File

@ -483,6 +483,43 @@ echo $msghdr | \
-e 's/msg_flags/Flags/' \
>> ${OUT}
# The MSG_ flags for Msghdr.
grep '^const _MSG_' gen-sysinfo.go | \
sed -e 's/^\(const \)_\(MSG_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
# The cmsghdr struct.
cmsghdr=`grep '^type _cmsghdr ' gen-sysinfo.go`
if test -n "$cmsghdr"; then
cmsghdr_len=`echo $cmsghdr | sed -n -e 's/^.*cmsg_len \([^ ]*\);.*$/\1/p'`
echo "type Cmsghdr_len_t $cmsghdr_len" >> ${OUT}
echo "$cmsghdr" | \
sed -e 's/_cmsghdr/Cmsghdr/' \
-e 's/cmsg_len *[a-zA-Z0-9_]*/Len Cmsghdr_len_t/' \
-e 's/cmsg_level/Level/' \
-e 's/cmsg_type/Type/' \
>> ${OUT}
# The size of the cmsghdr struct.
echo 'var SizeofCmsghdr = int(unsafe.Sizeof(Cmsghdr{}))' >> ${OUT}
fi
# The SCM_ flags for Cmsghdr.
grep '^const _SCM_' gen-sysinfo.go | \
sed -e 's/^\(const \)_\(SCM_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
# The ucred struct.
grep '^type _ucred ' gen-sysinfo.go | \
sed -e 's/_ucred/Ucred/' \
-e 's/pid/Pid/' \
-e 's/uid/Uid/' \
-e 's/gid/Gid/' \
>> ${OUT}
# The size of the ucred struct.
if grep 'type Ucred ' ${OUT} >/dev/null 2>&1; then
echo 'var SizeofUcred = int(unsafe.Sizeof(Ucred{}))' >> ${OUT}
fi
# The ip_mreq struct.
grep '^type _ip_mreq ' gen-sysinfo.go | \
sed -e 's/_ip_mreq/IPMreq/' \