diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-12-14 20:11:32 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-14 20:11:32 +0000 |
| commit | 22ae84e87a245ca815d04548b1f3ca6ae5f07af2 (patch) | |
| tree | 77e7ba1afc34cb67cbf2ab3ed11ab9f612111bb5 /pkg/tcpip/transport/udp | |
| parent | 702553edddb87e4aa93a190840948539233f61fc (diff) | |
| parent | 2e191cb3f72858c61943168a69b0aff0fda6ee45 (diff) | |
Merge release-20201208.0-43-g2e191cb3f (automated)
Diffstat (limited to 'pkg/tcpip/transport/udp')
| -rw-r--r-- | pkg/tcpip/transport/udp/endpoint.go | 13 | ||||
| -rw-r--r-- | pkg/tcpip/transport/udp/udp_state_autogen.go | 7 |
2 files changed, 2 insertions, 18 deletions
diff --git a/pkg/tcpip/transport/udp/endpoint.go b/pkg/tcpip/transport/udp/endpoint.go index 3a2baba14..763d1d654 100644 --- a/pkg/tcpip/transport/udp/endpoint.go +++ b/pkg/tcpip/transport/udp/endpoint.go @@ -144,9 +144,6 @@ type endpoint struct { // owner is used to get uid and gid of the packet. owner tcpip.PacketOwner - // linger is used for SO_LINGER socket option. - linger tcpip.LingerOption - // ops is used to get socket level options. ops tcpip.SocketOptions } @@ -768,11 +765,6 @@ func (e *endpoint) SetSockOpt(opt tcpip.SettableSocketOption) *tcpip.Error { case *tcpip.SocketDetachFilterOption: return nil - - case *tcpip.LingerOption: - e.mu.Lock() - e.linger = *v - e.mu.Unlock() } return nil } @@ -851,11 +843,6 @@ func (e *endpoint) GetSockOpt(opt tcpip.GettableSocketOption) *tcpip.Error { *o = tcpip.BindToDeviceOption(e.bindToDevice) e.mu.RUnlock() - case *tcpip.LingerOption: - e.mu.RLock() - *o = e.linger - e.mu.RUnlock() - default: return tcpip.ErrUnknownProtocolOption } diff --git a/pkg/tcpip/transport/udp/udp_state_autogen.go b/pkg/tcpip/transport/udp/udp_state_autogen.go index 451d8eff0..ec0a8c902 100644 --- a/pkg/tcpip/transport/udp/udp_state_autogen.go +++ b/pkg/tcpip/transport/udp/udp_state_autogen.go @@ -82,7 +82,6 @@ func (e *endpoint) StateFields() []string { "multicastMemberships", "effectiveNetProtos", "owner", - "linger", "ops", } } @@ -118,8 +117,7 @@ func (e *endpoint) StateSave(stateSinkObject state.Sink) { stateSinkObject.Save(24, &e.multicastMemberships) stateSinkObject.Save(25, &e.effectiveNetProtos) stateSinkObject.Save(26, &e.owner) - stateSinkObject.Save(27, &e.linger) - stateSinkObject.Save(28, &e.ops) + stateSinkObject.Save(27, &e.ops) } func (e *endpoint) StateLoad(stateSourceObject state.Source) { @@ -148,8 +146,7 @@ func (e *endpoint) StateLoad(stateSourceObject state.Source) { stateSourceObject.Load(24, &e.multicastMemberships) stateSourceObject.Load(25, &e.effectiveNetProtos) stateSourceObject.Load(26, &e.owner) - stateSourceObject.Load(27, &e.linger) - stateSourceObject.Load(28, &e.ops) + stateSourceObject.Load(27, &e.ops) stateSourceObject.LoadValue(6, new(int), func(y interface{}) { e.loadRcvBufSizeMax(y.(int)) }) stateSourceObject.LoadValue(19, new(string), func(y interface{}) { e.loadLastError(y.(string)) }) stateSourceObject.AfterLoad(e.afterLoad) |