Do not create a temporary transport channel when using max-bundle

webrtc/pc/channel.cc

 /*
  *  Copyright 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 194 matching lines @@
         transport_name_, cricket::ICE_CANDIDATE_COMPONENT_RTP);
   }
   if (rtcp_transport_channel_) {
     DisconnectFromTransportChannel(rtcp_transport_channel_);
     transport_controller_->DestroyTransportChannel_n(
         transport_name_, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   }
   network_thread_->Clear(this);
 }
 
-bool BaseChannel::Init_w() {
-  if (!network_thread_->Invoke<bool>(Bind(&BaseChannel::InitNetwork_n, this))) {
+bool BaseChannel::Init_w(const std::string* bundle_transport_name) {
+  if (!network_thread_->Invoke<bool>(
+          Bind(&BaseChannel::InitNetwork_n, this, bundle_transport_name))) {
     return false;
   }
 
   // Both RTP and RTCP channels are set, we can call SetInterface on
   // media channel and it can set network options.
   RTC_DCHECK(worker_thread_->IsCurrent());
   media_channel_->SetInterface(this);
   return true;
 }
 
-bool BaseChannel::InitNetwork_n() {
+bool BaseChannel::InitNetwork_n(const std::string* bundle_transport_name) {
   RTC_DCHECK(network_thread_->IsCurrent());
-  if (!SetTransport_n(content_name())) {
+  const std::string& transport_name =
+      (bundle_transport_name ? *bundle_transport_name : content_name());
+  if (!SetTransport_n(transport_name)) {
     return false;
   }
 
   if (!SetDtlsSrtpCryptoSuites_n(transport_channel_, false)) {
     return false;
   }
   if (rtcp_transport_enabled() &&
       !SetDtlsSrtpCryptoSuites_n(rtcp_transport_channel_, true)) {
     return false;
   }
@@ skipping 1207 matching lines @@
 
 VoiceChannel::~VoiceChannel() {
   TRACE_EVENT0("webrtc", "VoiceChannel::~VoiceChannel");
   StopAudioMonitor();
   StopMediaMonitor();
   // this can't be done in the base class, since it calls a virtual
   DisableMedia_w();
   Deinit();
 }
 
-bool VoiceChannel::Init_w() {
-  if (!BaseChannel::Init_w()) {
+bool VoiceChannel::Init_w(const std::string* bundle_transport_name) {
+  if (!BaseChannel::Init_w(bundle_transport_name)) {
     return false;
   }
   return true;
 }
 
 bool VoiceChannel::SetAudioSend(uint32_t ssrc,
                                 bool enable,
                                 const AudioOptions* options,
                                 AudioSource* source) {
   return InvokeOnWorker(Bind(&VoiceMediaChannel::SetAudioSend, media_channel(),
@@ skipping 308 matching lines @@
                            TransportController* transport_controller,
                            const std::string& content_name,
                            bool rtcp)
     : BaseChannel(worker_thread,
                   network_thread,
                   media_channel,
                   transport_controller,
                   content_name,
                   rtcp) {}
 
-bool VideoChannel::Init_w() {
-  if (!BaseChannel::Init_w()) {
+bool VideoChannel::Init_w(const std::string* bundle_transport_name) {
+  if (!BaseChannel::Init_w(bundle_transport_name)) {
     return false;
   }
   return true;
 }
 
 VideoChannel::~VideoChannel() {
   TRACE_EVENT0("webrtc", "VideoChannel::~VideoChannel");
   StopMediaMonitor();
   // this can't be done in the base class, since it calls a virtual
   DisableMedia_w();
@@ skipping 225 matching lines @@
 
 DataChannel::~DataChannel() {
   TRACE_EVENT0("webrtc", "DataChannel::~DataChannel");
   StopMediaMonitor();
   // this can't be done in the base class, since it calls a virtual
   DisableMedia_w();
 
   Deinit();
 }
 
-bool DataChannel::Init_w() {
-  if (!BaseChannel::Init_w()) {
+bool DataChannel::Init_w(const std::string* bundle_transport_name) {
+  if (!BaseChannel::Init_w(bundle_transport_name)) {
     return false;
   }
   media_channel()->SignalDataReceived.connect(
       this, &DataChannel::OnDataReceived);
   media_channel()->SignalReadyToSend.connect(
       this, &DataChannel::OnDataChannelReadyToSend);
   media_channel()->SignalStreamClosedRemotely.connect(
       this, &DataChannel::OnStreamClosedRemotely);
   return true;
 }
@@ skipping 277 matching lines @@
   return data_channel_type_ == DCT_RTP && BaseChannel::ShouldSetupDtlsSrtp_n();
 }
 
 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
   rtc::TypedMessageData<uint32_t>* message =
       new rtc::TypedMessageData<uint32_t>(sid);
   signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
 }
 
 }  // namespace cricket