Skip to content

Commit

Permalink
Cherry-pick #6841 to v1.60.x release branch (#6847)
Browse files Browse the repository at this point in the history
  • Loading branch information
easwars authored Dec 11, 2023
1 parent 3580447 commit 297d8dd
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
29 changes: 29 additions & 0 deletions internal/tcp_keepalive_nonunix.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//go:build !unix

/*
* Copyright 2023 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

package internal

import (
"net"
)

// NetDialerWithTCPKeepalive returns a vanilla net.Dialer on non-unix platforms.
func NetDialerWithTCPKeepalive() *net.Dialer {
return &net.Dialer{}
}
6 changes: 5 additions & 1 deletion internal/tcp_keepalive.go → internal/tcp_keepalive_unix.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build unix

/*
* Copyright 2023 gRPC authors.
*
Expand All @@ -21,6 +23,8 @@ import (
"net"
"syscall"
"time"

"golang.org/x/sys/unix"
)

// NetDialerWithTCPKeepalive returns a net.Dialer that enables TCP keepalives on
Expand All @@ -43,7 +47,7 @@ func NetDialerWithTCPKeepalive() *net.Dialer {
// the TCP keealive interval and time parameters.
Control: func(_, _ string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, syscall.SO_KEEPALIVE, 1)
unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_KEEPALIVE, 1)
})
},
}
Expand Down

0 comments on commit 297d8dd

Please sign in to comment.