diff options
| author | Dong-hee Na <donghee.na92@gmail.com> | 2019-05-05 17:23:20 +0900 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-05-06 18:01:09 +0000 |
| commit | b98cecff882e42c7f0842c7adae1deeca1b99002 (patch) | |
| tree | b9d3a345f1d8981ee191c099226d0beb37cec122 /src | |
| parent | d199369aab38febae37bbd3faede4a3a53a32d95 (diff) | |
| download | go-b98cecff882e42c7f0842c7adae1deeca1b99002.tar.xz | |
net: use same TCP Keep Alive interval between dial and accept
Fixes #31510
Change-Id: I601d114b617a055380bf3c805e2d9a9b0795b656
Reviewed-on: https://go-review.googlesource.com/c/go/+/175259
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/dial.go | 8 | ||||
| -rw-r--r-- | src/net/tcpsock_plan9.go | 3 | ||||
| -rw-r--r-- | src/net/tcpsock_posix.go | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/net/dial.go b/src/net/dial.go index e2e60530a9..4d55a95ddf 100644 --- a/src/net/dial.go +++ b/src/net/dial.go @@ -12,6 +12,12 @@ import ( "time" ) +// defaultTCPKeepAlive is a default constant value for TCPKeepAlive times +// See golang.org/issue/31510 +const ( + defaultTCPKeepAlive = 15 * time.Second +) + // A Dialer contains options for connecting to an address. // // The zero value for each field is equivalent to dialing @@ -425,7 +431,7 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (Conn setKeepAlive(tc.fd, true) ka := d.KeepAlive if d.KeepAlive == 0 { - ka = 15 * time.Second + ka = defaultTCPKeepAlive } setKeepAlivePeriod(tc.fd, ka) testHookSetKeepAlive(ka) diff --git a/src/net/tcpsock_plan9.go b/src/net/tcpsock_plan9.go index e538f55865..e2e835957c 100644 --- a/src/net/tcpsock_plan9.go +++ b/src/net/tcpsock_plan9.go @@ -8,7 +8,6 @@ import ( "context" "io" "os" - "time" ) func (c *TCPConn) readFrom(r io.Reader) (int64, error) { @@ -50,7 +49,7 @@ func (ln *TCPListener) accept() (*TCPConn, error) { setKeepAlive(fd, true) ka := ln.lc.KeepAlive if ln.lc.KeepAlive == 0 { - ka = 3 * time.Minute + ka = defaultTCPKeepAlive } setKeepAlivePeriod(fd, ka) } diff --git a/src/net/tcpsock_posix.go b/src/net/tcpsock_posix.go index 14d383b74d..e32d5d7ee3 100644 --- a/src/net/tcpsock_posix.go +++ b/src/net/tcpsock_posix.go @@ -11,7 +11,6 @@ import ( "io" "os" "syscall" - "time" ) func sockaddrToTCP(sa syscall.Sockaddr) Addr { @@ -146,7 +145,7 @@ func (ln *TCPListener) accept() (*TCPConn, error) { setKeepAlive(fd, true) ka := ln.lc.KeepAlive if ln.lc.KeepAlive == 0 { - ka = 3 * time.Minute + ka = defaultTCPKeepAlive } setKeepAlivePeriod(fd, ka) } |