Merge TeardownDataChannelTransport_n and OnTransportChannelClosed.
This consolidates termination logic in the DataChannelController
to make shut down consistent between when the transport notifies
of termination and when termination is initiated from the PC side.
This removes the need for `OnTransportChannelClosed` from the PC
side since we can just use TeardownDataChannelTransport_n (the two
were always being called together).
Bug: webrtc:11547
Change-Id: I1763f82cbfe1a3d5b8bfabb8d4cba0ee0fa95738
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/300561
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39838}
diff --git a/pc/sdp_offer_answer.cc b/pc/sdp_offer_answer.cc
index 0363042..4a86ba8 100644
--- a/pc/sdp_offer_answer.cc
+++ b/pc/sdp_offer_answer.cc
@@ -5110,18 +5110,12 @@
void SdpOfferAnswerHandler::DestroyDataChannelTransport(RTCError error) {
RTC_DCHECK_RUN_ON(signaling_thread());
- const bool has_sctp = pc_->sctp_mid().has_value();
-
context_->network_thread()->BlockingCall(
[&, data_channel_controller = data_channel_controller()] {
RTC_DCHECK_RUN_ON(context_->network_thread());
- if (has_sctp)
- data_channel_controller->OnTransportChannelClosed(error);
- pc_->TeardownDataChannelTransport_n();
+ pc_->TeardownDataChannelTransport_n(error);
});
-
- if (has_sctp)
- pc_->ResetSctpDataMid();
+ pc_->ResetSctpDataMid();
}
void SdpOfferAnswerHandler::DestroyAllChannels() {
