From 299cdc9057fb8925f1692ac8c7573f51b7872df6 Mon Sep 17 00:00:00 2001 From: Tommi Date: Mon, 26 Jun 2023 21:11:35 +0200 Subject: [PATCH] Revert mid check in SdpOfferAnswerHandler::CreateDataChannel. This check was added here: https://webrtc-review.googlesource.com/c/src/+/300544 When createOffer is used before createAnswer, this check would cause SetupDataChannelTransport_n to not be called for the remote channel. Bug: webrtc:15258 Change-Id: Ifdab35d1b0260ff03fef4beff13acf8090d59d8f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/310460 Reviewed-by: Harald Alvestrand Commit-Queue: Tomas Gunnarsson Cr-Commit-Position: refs/heads/main@{#40357} --- pc/sdp_offer_answer.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pc/sdp_offer_answer.cc b/pc/sdp_offer_answer.cc index fa16ec6282..97d01573cf 100644 --- a/pc/sdp_offer_answer.cc +++ b/pc/sdp_offer_answer.cc @@ -5169,11 +5169,7 @@ RTCError SdpOfferAnswerHandler::CreateChannels(const SessionDescription& desc) { bool SdpOfferAnswerHandler::CreateDataChannel(const std::string& mid) { RTC_DCHECK_RUN_ON(signaling_thread()); - if (pc_->sctp_mid().has_value()) { - RTC_DCHECK_EQ(mid, *pc_->sctp_mid()); - return true; // data channel already created. - } - + RTC_DCHECK(!pc_->sctp_mid().has_value() || mid == pc_->sctp_mid().value()); RTC_LOG(LS_INFO) << "Creating data channel, mid=" << mid; absl::optional transport_name =