diff options
| author | Ian Gudger <igudger@google.com> | 2018-12-21 13:12:32 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-12-21 13:13:45 -0800 |
| commit | b515556519a44d4b6a23590e236bb4f30726b5bf (patch) | |
| tree | 6ef8ce9bf1f963fc8f9829c489612ead2fd3b23f /pkg/tcpip/transport/ping | |
| parent | 0e9b32485670bb321b9b2eee3f1860e0db43d377 (diff) | |
Implement SO_KEEPALIVE, TCP_KEEPIDLE, and TCP_KEEPINTVL.
Within gVisor, plumb new socket options to netstack.
Within netstack, fix GetSockOpt and SetSockOpt return value logic.
PiperOrigin-RevId: 226532229
Change-Id: If40734e119eed633335f40b4c26facbebc791c74
Diffstat (limited to 'pkg/tcpip/transport/ping')
| -rw-r--r-- | pkg/tcpip/transport/ping/endpoint.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkg/tcpip/transport/ping/endpoint.go b/pkg/tcpip/transport/ping/endpoint.go index 10d4d138e..d1b9b136c 100644 --- a/pkg/tcpip/transport/ping/endpoint.go +++ b/pkg/tcpip/transport/ping/endpoint.go @@ -358,9 +358,15 @@ func (e *endpoint) GetSockOpt(opt interface{}) *tcpip.Error { *o = 1 } e.rcvMu.Unlock() - } + return nil - return tcpip.ErrUnknownProtocolOption + case *tcpip.KeepaliveEnabledOption: + *o = 0 + return nil + + default: + return tcpip.ErrUnknownProtocolOption + } } func sendPing4(r *stack.Route, ident uint16, data buffer.View) *tcpip.Error { |