diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-03-06 20:34:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-03-06 20:34:15 +0000 |
| commit | d80c5b0c6b44bb145788d699b8ffac109c5937d6 (patch) | |
| tree | 7ff5ca6054a625835c606216a0a4578cfffc285c /pkg/tcpip/transport/tcp | |
| parent | 57eb9dd84e0153bb1848c0246d86ef23d116d9a2 (diff) | |
| parent | 6fa5cee82c0f515b001dee5f3840e1f875b2f477 (diff) | |
Merge release-20200219.0-122-g6fa5cee (automated)
Diffstat (limited to 'pkg/tcpip/transport/tcp')
| -rwxr-xr-x | pkg/tcpip/transport/tcp/tcp_endpoint_list.go | 8 | ||||
| -rwxr-xr-x | pkg/tcpip/transport/tcp/tcp_segment_list.go | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkg/tcpip/transport/tcp/tcp_endpoint_list.go b/pkg/tcpip/transport/tcp/tcp_endpoint_list.go index 32ac43dca..62c042aff 100755 --- a/pkg/tcpip/transport/tcp/tcp_endpoint_list.go +++ b/pkg/tcpip/transport/tcp/tcp_endpoint_list.go @@ -135,8 +135,9 @@ func (l *endpointList) InsertBefore(a, e *endpoint) { // Remove removes e from l. func (l *endpointList) Remove(e *endpoint) { - prev := endpointElementMapper{}.linkerFor(e).Prev() - next := endpointElementMapper{}.linkerFor(e).Next() + linker := endpointElementMapper{}.linkerFor(e) + prev := linker.Prev() + next := linker.Next() if prev != nil { endpointElementMapper{}.linkerFor(prev).SetNext(next) @@ -149,6 +150,9 @@ func (l *endpointList) Remove(e *endpoint) { } else { l.tail = prev } + + linker.SetNext(nil) + linker.SetPrev(nil) } // Entry is a default implementation of Linker. Users can add anonymous fields diff --git a/pkg/tcpip/transport/tcp/tcp_segment_list.go b/pkg/tcpip/transport/tcp/tcp_segment_list.go index 9b21b87ad..27f17f037 100755 --- a/pkg/tcpip/transport/tcp/tcp_segment_list.go +++ b/pkg/tcpip/transport/tcp/tcp_segment_list.go @@ -135,8 +135,9 @@ func (l *segmentList) InsertBefore(a, e *segment) { // Remove removes e from l. func (l *segmentList) Remove(e *segment) { - prev := segmentElementMapper{}.linkerFor(e).Prev() - next := segmentElementMapper{}.linkerFor(e).Next() + linker := segmentElementMapper{}.linkerFor(e) + prev := linker.Prev() + next := linker.Next() if prev != nil { segmentElementMapper{}.linkerFor(prev).SetNext(next) @@ -149,6 +150,9 @@ func (l *segmentList) Remove(e *segment) { } else { l.tail = prev } + + linker.SetNext(nil) + linker.SetPrev(nil) } // Entry is a default implementation of Linker. Users can add anonymous fields |