net: Fix TCP keepalive handling for Solaris.

From-SVN: r204688

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 9a8a1b45530e497adac8f5a12e2f53443c4edd67..5a0c9d78bf3fd9d59ecaaef318d939181df413de 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -770,9 +770,13 @@ else
 if LIBGO_IS_DARWIN
 go_net_tcpsockopt_file = go/net/tcpsockopt_darwin.go
 else
+if LIBGO_IS_SOLARIS
+go_net_tcpsockopt_file = go/net/tcpsockopt_solaris.go
+else
 go_net_tcpsockopt_file =  go/net/tcpsockopt_unix.go
 endif
 endif
+endif
 
 go_net_files = \
        go/net/cgo_unix.go \

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 63e78b4e77aa99f9770b1986a70de7d49940c7b6..6434bcf518ec6c40df5a15c8d2ae2eeee3ccbc4d 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1006,7 +1006,8 @@ go_mime_files = \
 @LIBGO_IS_LINUX_TRUE@go_net_interface_file = go/net/interface_linux.go
 @LIBGO_IS_LINUX_FALSE@go_net_cloexec_file = go/net/sys_cloexec.go
 @LIBGO_IS_LINUX_TRUE@go_net_cloexec_file = go/net/sock_cloexec.go
-@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_OPENBSD_FALSE@go_net_tcpsockopt_file = go/net/tcpsockopt_unix.go
+@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_OPENBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@go_net_tcpsockopt_file = go/net/tcpsockopt_unix.go
+@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_OPENBSD_FALSE@@LIBGO_IS_SOLARIS_TRUE@go_net_tcpsockopt_file = go/net/tcpsockopt_solaris.go
 @LIBGO_IS_DARWIN_TRUE@@LIBGO_IS_OPENBSD_FALSE@go_net_tcpsockopt_file = go/net/tcpsockopt_darwin.go
 @LIBGO_IS_OPENBSD_TRUE@go_net_tcpsockopt_file = go/net/tcpsockopt_openbsd.go
 go_net_files = \

diff --git a/libgo/go/net/tcpsockopt_solaris.go b/libgo/go/net/tcpsockopt_solaris.go
new file mode 100644 (file)
index 0000000..a285e2d
--- /dev/null
+++ b/libgo/go/net/tcpsockopt_solaris.go
@@ -0,0 +1,25 @@
+// Copyright 2009 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package net
+
+import (
+       "os"
+       "syscall"
+       "time"
+)
+
+// Set keep alive period.
+func setKeepAlivePeriod(fd *netFD, d time.Duration) error {
+       if err := fd.incref(); err != nil {
+               return err
+       }
+       defer fd.decref()
+
+       // The kernel expects milliseconds so round to next highest millisecond.
+       d += (time.Millisecond - time.Nanosecond)
+       msecs := int(d.Nanoseconds() / time.Millisecond)
+
+       return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(fd.sysfd, syscall.IPPROTO_TCP, syscall.TCP_KEEPALIVE_THRESHOLD, msecs))
+}