8000 fix: avoid writing messages after close and improve handshake by FrauElster · Pull Request #476 · coder/websocket · GitHub
[go: up one dir, main page]
Skip to content

fix: avoid writing messages after close and improve handshake #476

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

Merged
merged 12 commits into from
Dec 4, 2024
+252 −65
Merged

fix: avoid writing messages after close and improve handshake #476

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0daf07f
adds a lock on writeClose. closes #448
FrauElster Sep 5, 2024
87caf58
moves the writeLock to writeFrame to avoid deadlock
FrauElster Sep 6, 2024
e70e060
group closeSent with writeFrameMu
mafredri Sep 6, 2024
2ea151a
return close sent for all writes, remove sentinel error
mafredri Sep 6, 2024
c3613fc
fix: echo read error after close received
mafredri Sep 17, 2024
8a6704c
Merge branch 'master' into FrauElster/master
mafredri Nov 21, 2024
cc1c15a
fix: rewrite close handshake flow when initiated from other side
mafredri Nov 29, 2024
038d6d0
fix timeout
mafredri Nov 29, 2024
9cd2adf
adjust opclose err on closed
mafredri Nov 29, 2024
e8f5b51
move disconnected comment
mafredri Nov 29, 2024
e410eab
add mutex comment
mafredri Nov 29, 2024
930432f
comment prepareRead and readMu unlocking
mafredri Dec 2, 2024
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
Prev Previous commit
comment prepareRead and readMu unlocking
  • Loading branch information
@mafredri
mafredri committed Dec 2, 2024
commit 930432faaae0475c7f1a9f2a410f6070a28fe8e7
9 changes: 9 additions & 0 deletions read.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,12 @@ func (c *Conn) readLoop(ctx context.Context) (header, error) {
}
}

// prepareRead sets the readTimeout context and returns a done function
// to be called after the read is done. It also returns an error if the
// connection is closed. The reference to the error is used to assign
// an error depending on if the connection closed or the context timed
// out during use. Typically the referenced error is a named return
// variable of the function calling this method.
func (c *Conn) prepareRead(ctx context.Context, err *error) (func(), error) {
select {
case <-c.closed:
Expand Down Expand Up @@ -335,6 +341,9 @@ func (c *Conn) handleControl(ctx context.Context, h header) (err error) {
closeSent := c.closeSentErr != nil
c.closeStateMu.Unlock()

// Only unlock readMu if this connection is being closed becaue
// c.close will try to acquire the readMu lock. We unlock for
// writeClose as well because it may also call c.close.
if !closeSent {
c.readMu.unlock()
_ = c.writeClose(ce.Code, ce.Reason)
Expand Down
0