diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-21 19:41:58 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-21 19:41:58 +0000 |
| commit | 16819419862b0847e0074c564284bab0663ed07f (patch) | |
| tree | 0a9ba7c146c7d432044476cbed04dfdb71e859e7 | |
| parent | c818aa278ea4525b077249e9e17830595c1b55e2 (diff) | |
| parent | 45cd7c1b1174dbeaebc1b52e20cb89927fb115ae (diff) | |
Merge release-20210614.0-6-g45cd7c1b1 (automated)
| -rw-r--r-- | pkg/tcpip/transport/tcp/connect.go | 2 | ||||
| -rw-r--r-- | pkg/tcpip/transport/tcp/rcv.go | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkg/tcpip/transport/tcp/connect.go b/pkg/tcpip/transport/tcp/connect.go index 2137ebc25..f86450298 100644 --- a/pkg/tcpip/transport/tcp/connect.go +++ b/pkg/tcpip/transport/tcp/connect.go @@ -1130,7 +1130,7 @@ func (e *endpoint) handleReset(s *segment) (ok bool, err tcpip.Error) { func (e *endpoint) handleSegmentsLocked(fastPath bool) tcpip.Error { checkRequeue := true for i := 0; i < maxSegmentsPerWake; i++ { - if e.EndpointState().closed() { + if state := e.EndpointState(); state.closed() || state == StateTimeWait { return nil } s := e.segmentQueue.dequeue() diff --git a/pkg/tcpip/transport/tcp/rcv.go b/pkg/tcpip/transport/tcp/rcv.go index 661ca604a..9ce8fcae9 100644 --- a/pkg/tcpip/transport/tcp/rcv.go +++ b/pkg/tcpip/transport/tcp/rcv.go @@ -559,7 +559,6 @@ func (r *receiver) handleTimeWaitSegment(s *segment) (resetTimeWait bool, newSyn // (2) returns to TIME-WAIT state if the SYN turns out // to be an old duplicate". if s.flags.Contains(header.TCPFlagSyn) && r.RcvNxt.LessThan(segSeq) { - return false, true } |