diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-17 13:48:20 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-17 13:48:20 +0000 |
| commit | 629c881535e4b9dbfac077c9f8073bff84869b15 (patch) | |
| tree | a7f5fe80499d44dbe5d1db37ebd4e39e0a1bf842 | |
| parent | 6cb5f4c66f69a8beee5aa2d45221b29d162e38f8 (diff) | |
| parent | b4de018a67f5b5cb5ffc782c915107e1402ed833 (diff) | |
Merge release-20200323.0-174-gb4de018 (automated)
| -rw-r--r-- | pkg/sentry/socket/unix/transport/unix.go | 2 | ||||
| -rw-r--r-- | pkg/tcpip/transport/icmp/endpoint.go | 4 | ||||
| -rw-r--r-- | pkg/tcpip/transport/tcp/endpoint.go | 4 | ||||
| -rw-r--r-- | pkg/tcpip/transport/udp/endpoint.go | 4 |
4 files changed, 1 insertions, 13 deletions
diff --git a/pkg/sentry/socket/unix/transport/unix.go b/pkg/sentry/socket/unix/transport/unix.go index 1f3880cc5..2f1b127df 100644 --- a/pkg/sentry/socket/unix/transport/unix.go +++ b/pkg/sentry/socket/unix/transport/unix.go @@ -850,7 +850,6 @@ func (e *baseEndpoint) SetSockOptBool(opt tcpip.SockOptBool, v bool) *tcpip.Erro case tcpip.ReuseAddressOption: default: log.Warningf("Unsupported socket option: %d", opt) - return tcpip.ErrUnknownProtocolOption } return nil } @@ -861,7 +860,6 @@ func (e *baseEndpoint) SetSockOptInt(opt tcpip.SockOptInt, v int) *tcpip.Error { case tcpip.ReceiveBufferSizeOption: default: log.Warningf("Unsupported socket option: %d", opt) - return tcpip.ErrUnknownProtocolOption } return nil } diff --git a/pkg/tcpip/transport/icmp/endpoint.go b/pkg/tcpip/transport/icmp/endpoint.go index 3a133eef9..feef8dca0 100644 --- a/pkg/tcpip/transport/icmp/endpoint.go +++ b/pkg/tcpip/transport/icmp/endpoint.go @@ -353,7 +353,7 @@ func (e *endpoint) SetSockOpt(opt interface{}) *tcpip.Error { // SetSockOptBool sets a socket option. Currently not supported. func (e *endpoint) SetSockOptBool(opt tcpip.SockOptBool, v bool) *tcpip.Error { - return tcpip.ErrUnknownProtocolOption + return nil } // SetSockOptInt sets a socket option. Currently not supported. @@ -364,8 +364,6 @@ func (e *endpoint) SetSockOptInt(opt tcpip.SockOptInt, v int) *tcpip.Error { e.ttl = uint8(v) e.mu.Unlock() - default: - return tcpip.ErrUnknownProtocolOption } return nil } diff --git a/pkg/tcpip/transport/tcp/endpoint.go b/pkg/tcpip/transport/tcp/endpoint.go index 5d0ea9e93..7e8def82d 100644 --- a/pkg/tcpip/transport/tcp/endpoint.go +++ b/pkg/tcpip/transport/tcp/endpoint.go @@ -1477,8 +1477,6 @@ func (e *endpoint) SetSockOptBool(opt tcpip.SockOptBool, v bool) *tcpip.Error { e.LockUser() e.v6only = v e.UnlockUser() - default: - return tcpip.ErrUnknownProtocolOption } return nil @@ -1592,8 +1590,6 @@ func (e *endpoint) SetSockOptInt(opt tcpip.SockOptInt, v int) *tcpip.Error { e.ttl = uint8(v) e.UnlockUser() - default: - return tcpip.ErrUnknownProtocolOption } return nil } diff --git a/pkg/tcpip/transport/udp/endpoint.go b/pkg/tcpip/transport/udp/endpoint.go index 492cc1fcb..edb54f0be 100644 --- a/pkg/tcpip/transport/udp/endpoint.go +++ b/pkg/tcpip/transport/udp/endpoint.go @@ -553,8 +553,6 @@ func (e *endpoint) SetSockOptBool(opt tcpip.SockOptBool, v bool) *tcpip.Error { } e.v6only = v - default: - return tcpip.ErrUnknownProtocolOption } return nil @@ -586,8 +584,6 @@ func (e *endpoint) SetSockOptInt(opt tcpip.SockOptInt, v int) *tcpip.Error { case tcpip.ReceiveBufferSizeOption: case tcpip.SendBufferSizeOption: - default: - return tcpip.ErrUnknownProtocolOption } return nil |