Skip to content

fix: add signalingState guard in ICE restart handler (WT-986) #1002

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

Closed
SERDUN wants to merge 5 commits into from
Closed

fix: add signalingState guard in ICE restart handler (WT-986) #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5b774c
fix: add signalingState guard in ICE restart handler to prevent setLo…
SERDUN Mar 17, 2026
debfcdf
fix: remove unused import and declaration in call_state_test
SERDUN Mar 17, 2026
e9ef2d5
fix: log warning when ICE restart skipped due to non-stable signaling…
SERDUN Mar 17, 2026
46d5266
fix: correct RFC 8829 reference in ICE restart comment (5.6 -> 1.1)
SERDUN Mar 17, 2026
8b5258b
fix: use W3C WebRTC spec reference instead of RFC 8829 in ICE restart…
SERDUN Mar 17, 2026
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
44 changes: 29 additions & 15 deletions lib/features/call/bloc/call_bloc.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2187,21 +2187,35 @@ class CallBloc extends Bloc<CallEvent, CallState> with WidgetsBindingObserver im
'__onPeerConnectionEventIceConnectionStateChanged: peerConnection is null - most likely some state issue',
);
} else {
await peerConnection.restartIce();
final localDescription = await peerConnection.createOffer({});
sdpMunger?.apply(localDescription);

// According to RFC 8829 5.6 (https://datatracker.ietf.org/doc/html/rfc8829#section-5.6),
// localDescription should be set before sending the answer to transition into stable state.
await peerConnection.setLocalDescription(localDescription);

final updateRequest = UpdateRequest(
transaction: WebtritSignalingClient.generateTransactionId(),
line: activeCall.line,
callId: activeCall.callId,
jsep: localDescription.toMap(),
);
await _signalingClient?.execute(updateRequest);
final pcState = peerConnection.signalingState;
if (pcState == RTCSignalingState.RTCSignalingStateStable) {
await peerConnection.restartIce();
final localDescription = await peerConnection.createOffer({});
sdpMunger?.apply(localDescription);

final currentState = peerConnection.signalingState;
if (currentState == RTCSignalingState.RTCSignalingStateStable) {
// According to the WebRTC spec (https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-setlocaldescription),
// setLocalDescription must be called before sending the offer to the remote side.
await peerConnection.setLocalDescription(localDescription);

final updateRequest = UpdateRequest(
transaction: WebtritSignalingClient.generateTransactionId(),
line: activeCall.line,
callId: activeCall.callId,
jsep: localDescription.toMap(),
);
await _signalingClient?.execute(updateRequest);
} else {
_logger.warning(
'__onPeerConnectionEventIceConnectionStateChanged: signalingState changed mid-flight ($currentState), skipping setLocalDescription',
);
}
} else {
_logger.warning(
'__onPeerConnectionEventIceConnectionStateChanged: signalingState is $pcState, skipping ICE restart',
);
}
}
});
} catch (e, stackTrace) {
Expand Down
Loading
Loading