Skip to content

chore: Update pion/ice fork to resolve goroutine leak #78

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 13 commits into from
Jan 28, 2022
+46 −47
Merged

chore: Update pion/ice fork to resolve goroutine leak #78

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
18eac83
chore: Update pion/ice fork to resolve goroutine leak
kylecarbs Jan 27, 2022
ebb94b8
Flush remote too
kylecarbs Jan 27, 2022
de209c7
Add logs for setting the description
kylecarbs Jan 27, 2022
6f7e3af
Try locking only on remote
kylecarbs Jan 27, 2022
a918c93
Remove local bufferring in favor of remote
kylecarbs Jan 27, 2022
44cad06
Remove unused flush func
kylecarbs Jan 27, 2022
d62797e
Set candidates flushed to true
kylecarbs Jan 27, 2022
982fde3
Defer flush until the end of negotiation
kylecarbs Jan 27, 2022
e154d6e
Buffer ICE candidates
kylecarbs Jan 27, 2022
a2a4da4
Add comment clarifying channel buffer
kylecarbs Jan 27, 2022
aa1e664
Flush after handshake
kylecarbs Jan 27, 2022
7b3e89d
Move away from fork
kylecarbs Jan 27, 2022
f3717ca
Ignore pion/ice leaks
kylecarbs Jan 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
Next Next commit
Flush after handshake
  • Loading branch information
@kylecarbs
kylecarbs committed Jan 27, 2022
commit aa1e664e4ac6ead63dae02d5ffb5700e4f5ecba0
32 changes: 16 additions & 16 deletions peer/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,22 +283,6 @@ func (c *Conn) negotiate() {
return
}

// The ICE transport resets when the remote description is updated.
// Adding ICE candidates before this point causes a failed connection,
// because the candidate would be lost.
c.pendingCandidatesMutex.Lock()
defer c.pendingCandidatesMutex.Unlock()
for _, pendingCandidate := range c.pendingRemoteCandidates {
c.opts.Logger.Debug(context.Background(), "flushing remote candidate")
err := c.rtc.AddICECandidate(pendingCandidate)
if err != nil {
_ = c.CloseWithError(xerrors.Errorf("flush pending candidates: %w", err))
return
}
}
c.pendingCandidatesFlushed = true
c.opts.Logger.Debug(context.Background(), "flushed remote candidates")

if !c.offerrer {
answer, err := c.rtc.CreateAnswer(&webrtc.AnswerOptions{})
if err != nil {
Expand All @@ -320,6 +304,22 @@ func (c *Conn) negotiate() {
case c.localSessionDescriptionChannel <- answer:
}
}

// The ICE transport resets when the remote description is updated.
// Adding ICE candidates before this point causes a failed connection,
// because the candidate would be lost.
c.pendingCandidatesMutex.Lock()
defer c.pendingCandidatesMutex.Unlock()
for _, pendingCandidate := range c.pendingRemoteCandidates {
c.opts.Logger.Debug(context.Background(), "flushing remote candidate")
err := c.rtc.AddICECandidate(pendingCandidate)
if err != nil {
_ = c.CloseWithError(xerrors.Errorf("flush pending candidates: %w", err))
return
}
}
c.pendingCandidatesFlushed = true
c.opts.Logger.Debug(context.Background(), "flushed remote candidates")
}

// LocalCandidate returns a channel that emits when a local candidate
Expand Down