qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 11:04:56 -07:00
Code Releases Activity

fix abstract unix domain sockets

Browse Source 
R=rsc
DELTA=5  (3 added, 0 deleted, 2 changed)
OCL=28845
CL=28849
This commit is contained in:
Rob Pike 2009-05-14 15:20:30 -07:00
parent 05851636f3
commit 80b5482ab2
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/net/net_linux.go
View File

@ -95,6 +95,7 @@ func unixToSockaddr(name string) (sa1 *syscall.Sockaddr, err os.Error) {
if sa.Path[0] == '@' { if sa.Path[0] == '@' {
sa.Path[0] = 0; sa.Path[0] = 0;
} }
sa.Length = 1 + int64(n) + 1; // family, name, \0
return (*syscall.Sockaddr)(unsafe.Pointer(sa)), nil; return (*syscall.Sockaddr)(unsafe.Pointer(sa)), nil;
} }

3
src/lib/syscall/socket_linux.go
View File

@ -19,7 +19,8 @@ var SocketDisableIPv6 bool
func saLen(s *Sockaddr) int64 { func saLen(s *Sockaddr) int64 {
switch s.Family { switch s.Family {
case AF_UNIX: case AF_UNIX:
return SizeofSockaddrUnix; sa := (*SockaddrUnix)(unsafe.Pointer(s));
return sa.Length;
case AF_INET: case AF_INET:
return SizeofSockaddrInet4; return SizeofSockaddrInet4;
case AF_INET6: case AF_INET6:

3
src/lib/syscall/types_amd64_linux.go
View File

@ -166,7 +166,8 @@ const (
type SockaddrUnix struct { type SockaddrUnix struct {
Family uint16; Family uint16;
Path [108]byte Path [108]byte;
Length int64; // Not part of the kernel structure; used internally
} }
const SizeofSockaddrUnix = 110 const SizeofSockaddrUnix = 110