Skip to content

Commit db8d5b7

Browse files
committed
net: try to fix setKeepAlivePeriod on Solaris
Unfortunately Oracle Solaris does not have TCP_KEEPIDLE and TCP_KEEPINTVL. TCP_KEEPIDLE is equivalent to TCP_KEEPALIVE_THRESHOLD, but TCP_KEEPINTVL does not have a direct equivalent, so we don't set TCP_KEEPINTVL any more. Old Darwin versions also lack TCP_KEEPINTVL, but the code tries to set it anyway so that it works on newer versions. We can't do that because Oracle might assign the number illumos uses for TCP_KEEPINTVL to a constant with a different meaning. Unfortunately there's nothing we can do if we want to support both illumos and Oracle Solaris with the same GOOS. Updates #9614. Change-Id: Id39eb5147f7afa8e951f886c0bf529d00f0e1bd4 Reviewed-on: https://go-review.googlesource.com/7690 Reviewed-by: Minux Ma <[email protected]> Reviewed-by: Mikio Hara <[email protected]>
1 parent fe5ef5c commit db8d5b7

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

src/net/tcpsockopt_solaris.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Copyright 2015 The Go Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
package net
6+
7+
import (
8+
"os"
9+
"syscall"
10+
"time"
11+
)
12+
13+
func setKeepAlivePeriod(fd *netFD, d time.Duration) error {
14+
if err := fd.incref(); err != nil {
15+
return err
16+
}
17+
defer fd.decref()
18+
// The kernel expects milliseconds so round to next highest
19+
// millisecond.
20+
d += (time.Millisecond - time.Nanosecond)
21+
msecs := int(d / time.Millisecond)
22+
23+
// Normally we'd do
24+
// syscall.SetsockoptInt(fd.sysfd, syscall.IPPROTO_TCP, syscall.TCP_KEEPINTVL, secs)
25+
// here, but we can't because Solaris does not have TCP_KEEPINTVL.
26+
// Solaris has TCP_KEEPALIVE_ABORT_THRESHOLD, but it's not the same
27+
// thing, it refers to the total time until aborting (not between
28+
// probes), and it uses an exponential backoff algorithm instead of
29+
// waiting the same time between probes. We can't hope for the best
30+
// and do it anyway, like on Darwin, because Solaris might eventually
31+
// allocate a constant with a different meaning for the value of
32+
// TCP_KEEPINTVL on illumos.
33+
34+
return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(fd.sysfd, syscall.IPPROTO_TCP, syscall.TCP_KEEPALIVE_THRESHOLD, msecs))
35+
}

src/net/tcpsockopt_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
// +build freebsd linux netbsd solaris
5+
// +build freebsd linux netbsd
66

77
package net
88

0 commit comments

Comments
 (0)