Skip to content
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

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

Merged
merged 12 commits into from
Dec 4, 2024
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
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
1 change: 1 addition & 0 deletions conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ type Conn struct {
writeBuf []byte
writeHeaderBuf [8]byte
writeHeader header
closeSent bool
FrauElster marked this conversation as resolved.
Show resolved Hide resolved

closeReadMu sync.Mutex
closeReadCtx context.Context
Expand Down
13 changes: 13 additions & 0 deletions write.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,15 @@ func (c *Conn) writeFrame(ctx context.Context, fin bool, flate bool, opcode opco
}
defer c.writeFrameMu.unlock()

if c.closeSent {
select {
case <-c.closed:
return 0, net.ErrClosed
default:
}
return 0, errors.New("close sent")
}
FrauElster marked this conversation as resolved.
Show resolved Hide resolved

select {
case <-c.closed:
return 0, net.ErrClosed
Expand Down Expand Up @@ -303,6 +312,10 @@ func (c *Conn) writeFrame(ctx context.Context, fin bool, flate bool, opcode opco
}
}

if opcode == opClose {
c.closeSent = true
}

select {
case <-c.closed:
if opcode == opClose {
Expand Down
Loading