More minor improvements to BaseChannel/transport code.

webrtc/api/webrtcsession.cc

 /*
  *  Copyright 2012 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 1074 matching lines @@
     cricket::TransportChannel* rtp_transport =
         transport_controller_->CreateTransportChannel(
             transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
     bool need_rtcp = (ch->rtcp_transport() != nullptr);
     cricket::TransportChannel* rtcp_transport = nullptr;
     if (need_rtcp) {
       rtcp_transport = transport_controller_->CreateTransportChannel_n(
           transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
     }
 
-    if (!ch->SetTransport(rtp_transport, rtcp_transport)) {
-      LOG(LS_WARNING) << "Failed to enable BUNDLE for " << ch->content_name();
-      return false;
-    }
+    ch->SetTransports(rtp_transport, rtcp_transport);
     LOG(LS_INFO) << "Enabled BUNDLE for " << ch->content_name() << " on "
                  << transport_name << ".";
-    DestroyTransport(old_transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+    transport_controller_->DestroyTransportChannel(
+        old_transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
     // If the channel needs rtcp, it means that the channel used to have a
     // rtcp transport which needs to be deleted now.
     if (need_rtcp) {
-      DestroyTransport(old_transport_name,
-                       cricket::ICE_CANDIDATE_COMPONENT_RTCP);
+      transport_controller_->DestroyTransportChannel(
+          old_transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
     }
     return true;
   };
 
   if (!maybe_set_transport(voice_channel()) ||
       !maybe_set_transport(video_channel()) ||
       !maybe_set_transport(rtp_data_channel())) {
     return false;
   }
   // For SCTP, transport creation/deletion happens here instead of in the
@@ skipping 681 matching lines @@
   if (!require_rtcp_mux) {
     rtcp_transport = transport_controller_->CreateTransportChannel(
         transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   }
 
   voice_channel_.reset(channel_manager_->CreateVoiceChannel(
       media_controller_, rtp_transport, rtcp_transport,
       transport_controller_->signaling_thread(), content->name,
       bundle_transport, require_rtcp_mux, SrtpRequired(), audio_options_));
   if (!voice_channel_) {
+    transport_controller_->DestroyTransportChannel(
+        transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+    if (rtcp_transport) {
+      transport_controller_->DestroyTransportChannel(
+          transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+    }
     return false;
   }
 
   voice_channel_->SignalRtcpMuxFullyActive.connect(
       this, &WebRtcSession::DestroyRtcpTransport_n);
   voice_channel_->SignalDtlsSrtpSetupFailure.connect(
       this, &WebRtcSession::OnDtlsSrtpSetupFailure);
 
   SignalVoiceChannelCreated();
   voice_channel_->SignalSentPacket.connect(this,
@@ skipping 17 matching lines @@
     rtcp_transport = transport_controller_->CreateTransportChannel(
         transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   }
 
   video_channel_.reset(channel_manager_->CreateVideoChannel(
       media_controller_, rtp_transport, rtcp_transport,
       transport_controller_->signaling_thread(), content->name,
       bundle_transport, require_rtcp_mux, SrtpRequired(), video_options_));
 
   if (!video_channel_) {
+    transport_controller_->DestroyTransportChannel(
+        transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+    if (rtcp_transport) {
+      transport_controller_->DestroyTransportChannel(
+          transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+    }
     return false;
   }
 
   video_channel_->SignalRtcpMuxFullyActive.connect(
       this, &WebRtcSession::DestroyRtcpTransport_n);
   video_channel_->SignalDtlsSrtpSetupFailure.connect(
       this, &WebRtcSession::OnDtlsSrtpSetupFailure);
 
   SignalVideoChannelCreated();
   video_channel_->SignalSentPacket.connect(this,
@@ skipping 39 matching lines @@
       rtcp_transport = transport_controller_->CreateTransportChannel(
           transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
     }
 
     rtp_data_channel_.reset(channel_manager_->CreateRtpDataChannel(
         media_controller_, rtp_transport, rtcp_transport,
         transport_controller_->signaling_thread(), content->name,
         bundle_transport, require_rtcp_mux, SrtpRequired()));
 
     if (!rtp_data_channel_) {
+      transport_controller_->DestroyTransportChannel(
+          transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+      if (rtcp_transport) {
+        transport_controller_->DestroyTransportChannel(
+            transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+      }
       return false;
     }
 
     rtp_data_channel_->SignalRtcpMuxFullyActive.connect(
         this, &WebRtcSession::DestroyRtcpTransport_n);
     rtp_data_channel_->SignalDtlsSrtpSetupFailure.connect(
         this, &WebRtcSession::OnDtlsSrtpSetupFailure);
     rtp_data_channel_->SignalSentPacket.connect(this,
                                                 &WebRtcSession::OnSentPacket_w);
   }
@@ skipping 444 matching lines @@
       if (content_name == *sctp_content_name_) {
         return *sctp_transport_name_;
       }
     }
     // Return an empty string if failed to retrieve the transport name.
     return "";
   }
   return channel->transport_name();
 }
 
-void WebRtcSession::DestroyTransport(const std::string& transport_name,
-                                     int component) {
-  network_thread_->Invoke<void>(
-      RTC_FROM_HERE,
-      rtc::Bind(&cricket::TransportController::DestroyTransportChannel_n,
-                transport_controller_.get(), transport_name, component));
-}
-
 void WebRtcSession::DestroyRtcpTransport_n(const std::string& transport_name) {
   RTC_DCHECK(network_thread()->IsCurrent());
   transport_controller_->DestroyTransportChannel_n(
       transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
 }
 
 void WebRtcSession::DestroyVideoChannel() {
   SignalVideoChannelDestroyed();
   RTC_DCHECK(video_channel_->rtp_transport());
   std::string transport_name;
   transport_name = video_channel_->rtp_transport()->transport_name();
   bool need_to_delete_rtcp = (video_channel_->rtcp_transport() != nullptr);
   channel_manager_->DestroyVideoChannel(video_channel_.release());
-  DestroyTransport(transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+  transport_controller_->DestroyTransportChannel(
+      transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
   if (need_to_delete_rtcp) {
-    DestroyTransport(transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
+    transport_controller_->DestroyTransportChannel(
+        transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   }
 }
 
 void WebRtcSession::DestroyVoiceChannel() {
   SignalVoiceChannelDestroyed();
   RTC_DCHECK(voice_channel_->rtp_transport());
   std::string transport_name;
   transport_name = voice_channel_->rtp_transport()->transport_name();
   bool need_to_delete_rtcp = (voice_channel_->rtcp_transport() != nullptr);
   channel_manager_->DestroyVoiceChannel(voice_channel_.release());
-  DestroyTransport(transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+  transport_controller_->DestroyTransportChannel(
+      transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
   if (need_to_delete_rtcp) {
-    DestroyTransport(transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
+    transport_controller_->DestroyTransportChannel(
+        transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   }
 }
 
 void WebRtcSession::DestroyDataChannel() {
   SignalDataChannelDestroyed();
   RTC_DCHECK(rtp_data_channel_->rtp_transport());
   std::string transport_name;
   transport_name = rtp_data_channel_->rtp_transport()->transport_name();
   bool need_to_delete_rtcp = (rtp_data_channel_->rtcp_transport() != nullptr);
   channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release());
-  DestroyTransport(transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+  transport_controller_->DestroyTransportChannel(
+      transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
   if (need_to_delete_rtcp) {
-    DestroyTransport(transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
+    transport_controller_->DestroyTransportChannel(
+        transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
   }
 }
 }  // namespace webrtc