Skip to content

fix: Close peer negotiate mutex if we haven't negotiated #1774

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 2 commits into from
May 27, 2022
Merged

fix: Close peer negotiate mutex if we haven't negotiated #1774

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7a1ec5
fix: Close peer negotiate mutex if we haven't negotiated
kylecarbs May 26, 2022
98a81ba
Merge branch 'main' into negotiatemutex
kylecarbs May 27, 2022
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
Merge branch 'main' into negotiatemutex
  • Loading branch information
@kylecarbs
kylecarbs committed May 27, 2022
commit 98a81ba6d5c14f087713cb3445dde3b6d1e8c79a
9 changes: 0 additions & 9 deletions peer/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,15 +606,6 @@ func (c *Conn) CloseWithError(err error) error {
// All logging, goroutines, and async functionality is cleaned up after this.
c.dcClosedWaitGroup.Wait()

// It's possible the connection can be closed before negotiation has
// began. In this case, we want to unlock the mutex to unblock any
// pending candidates being flushed.
select {
case <-c.negotiated:
default:
close(c.negotiated)
}

// Disable logging!
c.loggerValue.Store(slog.Logger{})
logger.Sync()
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.