fix: Lock when obtaining a peer connection answer<->offer #24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes a race in the peerbroker package where ICE candidates could be added before the connection was negotiated. This would result in the connection failing.
peerbroker/listen.go
Outdated
| @@ -184,7 +184,7 @@ func (b *peerBrokerService) NegotiateConnection(stream proto.DRPCPeerBroker_Nego | |||
| Candidate: clientToServerMessage.GetIceCandidate(), | |||
| }) | |||
| if err != nil { | |||
| return peerConn.CloseWithError(xerrors.Errorf("add remote candidate: %w", err)) | |||
| return peerConn.CloseWithError(xerrors.Errorf("add remote candidate: %+v: %w", clientToServerMessage.GetIceCandidate(), err)) | |||
There was a problem hiding this comment.
Thanks for adding this extra logging!
Codecov Report
@@ Coverage Diff @@
## main #24 +/- ##
==========================================
+ Coverage 70.61% 70.91% +0.29%
==========================================
Files 18 18
Lines 1130 1138 +8
==========================================
+ Hits 798 807 +9
+ Misses 262 261 -1
Partials 70 70
Continue to review full report at Codecov.
|
| @@ -84,7 +84,7 @@ func Dial(stream proto.DRPCPeerBroker_NegotiateConnectionClient, iceServers []we | |||
| for { | |||
| serverToClientMessage, err := stream.Recv() | |||
| if err != nil { | |||
| _ = peerConn.CloseWithError(err) | |||
| _ = peerConn.CloseWithError(xerrors.Errorf("recv: %w", err)) | |||
There was a problem hiding this comment.
Glad to have more info when this comes up!
bryphe-coder
approved these changes
Jan 13, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a race in the peerbroker package where ICE candidates could be added before the connection was negotiated. This would result in the connection failing.