opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Miscellaneous small cleanups (#2291)

Browse Source
This commit is contained in:
dfawley
2018-09-04 15:11:50 -07:00
committed by GitHub
parent 826807ed07
commit ccd64cfcfa
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/channelz/types_linux.go
View File

@ -50,5 +50,4 @@ func (s *SocketOptionData) Getsockopt(fd uintptr) {
if v, err := unix.GetsockoptTCPInfo(int(fd), syscall.SOL_TCP, syscall.TCP_INFO); err == nil { if v, err := unix.GetsockoptTCPInfo(int(fd), syscall.SOL_TCP, syscall.TCP_INFO); err == nil {
s.TCPInfo = v s.TCPInfo = v
} }
return
} }

3
internal/channelz/util_test.go
View File

@ -56,8 +56,7 @@ func TestGetSocketOpt(t *testing.T) {
recvTimout := &unix.Timeval{Sec: 100} recvTimout := &unix.Timeval{Sec: 100}
sendTimeout := &unix.Timeval{Sec: 8888} sendTimeout := &unix.Timeval{Sec: 8888}
raw.Control(func(fd uintptr) { raw.Control(func(fd uintptr) {
var err error err := unix.SetsockoptLinger(int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, l)
err = unix.SetsockoptLinger(int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, l)
if err != nil { if err != nil {
t.Fatalf("failed to SetsockoptLinger(%v,%v,%v,%v) due to %v", int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, l, err) t.Fatalf("failed to SetsockoptLinger(%v,%v,%v,%v) due to %v", int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, l, err)
} }