Skip to content

netstack: remove timed-out endpoints from pendingEndpoints queue. #11557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

netstack: remove timed-out endpoints from pendingEndpoints queue. #11557

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/tcpip/transport/tcp/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,6 +1193,14 @@ func (e *Endpoint) cleanupLocked() {
e.timeWaitTimer.Stop()
}

// Remove current EP from its lEP acceptQueue.pendingEndpoint if exists.
if e.h != nil && e.h.listenEP != nil {
lEP := e.h.listenEP
lEP.acceptMu.Lock()
delete(lEP.acceptQueue.pendingEndpoints, e)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also need to remove it from lEP.acceptQueue.endpoints (completed handshaking but not taken by an accept call) during cleanupLocked?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For instance, if cleanupLocked is triggered by a timeout handle, if present, or by an explicit reset from the peer.

lEP.acceptMu.Unlock()
}

// Close all endpoints that might have been accepted by TCP but not by
// the client.
e.closePendingAcceptableConnectionsLocked()
Expand Down