Add a minimal RtpTransport class for use by BaseChannel.

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 149 matching lines @@
                          rtc::Thread* network_thread,
                          rtc::Thread* signaling_thread,
                          MediaChannel* media_channel,
                          const std::string& content_name,
                          bool rtcp_mux_required,
                          bool srtp_required)
     : worker_thread_(worker_thread),
       network_thread_(network_thread),
       signaling_thread_(signaling_thread),
       content_name_(content_name),
-      rtcp_mux_required_(rtcp_mux_required),
+      rtp_transport_(rtcp_mux_required),
       srtp_required_(srtp_required),
       media_channel_(media_channel),
       selected_candidate_pair_(nullptr) {
   RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
 #if defined(ENABLE_EXTERNAL_AUTH)
   srtp_filter_.EnableExternalAuth();
 #endif
   LOG(LS_INFO) << "Created channel for " << content_name;
 }
 
@@ skipping 13 matching lines @@
 }
 
 void BaseChannel::DisconnectTransportChannels_n() {
   // Send any outstanding RTCP packets.
   FlushRtcpMessages_n();
 
   // Stop signals from transport channels, but keep them alive because
   // media_channel may use them from a different thread.
   if (rtp_dtls_transport_) {
     DisconnectFromDtlsTransport(rtp_dtls_transport_);
-  } else if (rtp_packet_transport_) {
-    DisconnectFromPacketTransport(rtp_packet_transport_);
+  } else if (rtp_transport_.rtp_packet_transport()) {
+    DisconnectFromPacketTransport(rtp_transport_.rtp_packet_transport());
   }
   if (rtcp_dtls_transport_) {
     DisconnectFromDtlsTransport(rtcp_dtls_transport_);
-  } else if (rtcp_packet_transport_) {
-    DisconnectFromPacketTransport(rtcp_packet_transport_);
+  } else if (rtp_transport_.rtcp_packet_transport()) {
+    DisconnectFromPacketTransport(rtp_transport_.rtcp_packet_transport());
   }
 
   // Clear pending read packets/messages.
   network_thread_->Clear(&invoker_);
   network_thread_->Clear(this);
 }
 
 bool BaseChannel::Init_w(DtlsTransportInternal* rtp_dtls_transport,
                          DtlsTransportInternal* rtcp_dtls_transport,
                          rtc::PacketTransportInternal* rtp_packet_transport,
@@ skipping 21 matching lines @@
                   rtcp_packet_transport);
 
   if (rtp_dtls_transport_ &&
       !SetDtlsSrtpCryptoSuites_n(rtp_dtls_transport_, false)) {
     return false;
   }
   if (rtcp_dtls_transport_ &&
       !SetDtlsSrtpCryptoSuites_n(rtcp_dtls_transport_, true)) {
     return false;
   }
-  if (rtcp_mux_required_) {
+  if (rtp_transport_.rtcp_mux_required()) {
     rtcp_mux_filter_.SetActive();
   }
   return true;
 }
 
 void BaseChannel::Deinit() {
   RTC_DCHECK(worker_thread_->IsCurrent());
   media_channel_->SetInterface(NULL);
   // Packets arrive on the network thread, processing packets calls virtual
   // functions, so need to stop this process in Deinit that is called in
@@ skipping 25 matching lines @@
     rtc::PacketTransportInternal* rtcp_packet_transport) {
   RTC_DCHECK(network_thread_->IsCurrent());
   // Validate some assertions about the input.
   RTC_DCHECK(rtp_packet_transport);
   RTC_DCHECK_EQ(NeedsRtcpTransport(), rtcp_packet_transport != nullptr);
   if (rtp_dtls_transport || rtcp_dtls_transport) {
     // DTLS/non-DTLS pointers should be to the same object.
     RTC_DCHECK(rtp_dtls_transport == rtp_packet_transport);
     RTC_DCHECK(rtcp_dtls_transport == rtcp_packet_transport);
     // Can't go from non-DTLS to DTLS.
-    RTC_DCHECK(!rtp_packet_transport_ || rtp_dtls_transport_);
+    RTC_DCHECK(!rtp_transport_.rtp_packet_transport() || rtp_dtls_transport_);
   } else {
     // Can't go from DTLS to non-DTLS.
     RTC_DCHECK(!rtp_dtls_transport_);
   }
   // Transport names should be the same.
   if (rtp_dtls_transport && rtcp_dtls_transport) {
     RTC_DCHECK(rtp_dtls_transport->transport_name() ==
                rtcp_dtls_transport->transport_name());
   }
   std::string debug_name;
   if (rtp_dtls_transport) {
     transport_name_ = rtp_dtls_transport->transport_name();
     debug_name = transport_name_;
   } else {
     debug_name = rtp_packet_transport->debug_name();
   }
-  if (rtp_packet_transport == rtp_packet_transport_) {
+  if (rtp_packet_transport == rtp_transport_.rtp_packet_transport()) {
     // Nothing to do if transport isn't changing.
     return;
   }
 
   // When using DTLS-SRTP, we must reset the SrtpFilter every time the transport
   // changes and wait until the DTLS handshake is complete to set the newly
   // negotiated parameters.
   if (ShouldSetupDtlsSrtp_n()) {
     // Set |writable_| to false such that UpdateWritableState_w can set up
     // DTLS-SRTP when |writable_| becomes true again.
@@ skipping 19 matching lines @@
   // We can only update ready-to-send after updating writability.
   //
   // On setting a new channel, assume it's ready to send if it's writable,
   // because we have no way of knowing otherwise (the channel doesn't give us
   // "was last send successful?").
   //
   // This won't always be accurate (the last SendPacket call from another
   // BaseChannel could have resulted in an error), but even so, we'll just
   // encounter the error again and update "ready to send" accordingly.
   SetTransportChannelReadyToSend(
-      false, rtp_packet_transport_ && rtp_packet_transport_->writable());
+      false, rtp_packet_transport && rtp_packet_transport->writable());
   SetTransportChannelReadyToSend(
-      true, rtcp_packet_transport_ && rtcp_packet_transport_->writable());
+      true, rtcp_packet_transport && rtcp_packet_transport->writable());
 }
 
 void BaseChannel::SetTransport_n(
     bool rtcp,
     DtlsTransportInternal* new_dtls_transport,
     rtc::PacketTransportInternal* new_packet_transport) {
   RTC_DCHECK(network_thread_->IsCurrent());
   DtlsTransportInternal*& old_dtls_transport =
       rtcp ? rtcp_dtls_transport_ : rtp_dtls_transport_;
-  rtc::PacketTransportInternal*& old_packet_transport =
-      rtcp ? rtcp_packet_transport_ : rtp_packet_transport_;
+  rtc::PacketTransportInternal* old_packet_transport =
+      rtcp ? rtp_transport_.rtcp_packet_transport()
+           : rtp_transport_.rtp_packet_transport();
 
   if (!old_packet_transport && !new_packet_transport) {
     // Nothing to do.
     return;
   }
 
   RTC_DCHECK(old_packet_transport != new_packet_transport);
   if (old_dtls_transport) {
     DisconnectFromDtlsTransport(old_dtls_transport);
   } else if (old_packet_transport) {
     DisconnectFromPacketTransport(old_packet_transport);
   }
 
-  old_packet_transport = new_packet_transport;
+  if (rtcp) {
+    rtp_transport_.set_rtcp_packet_transport(new_packet_transport);
+  } else {
+    rtp_transport_.set_rtp_packet_transport(new_packet_transport);
+  }
   old_dtls_transport = new_dtls_transport;
 
   // If there's no new transport, we're done after disconnecting from old one.
   if (!new_packet_transport) {
     return;
   }
 
   if (rtcp && new_dtls_transport) {
     RTC_CHECK(!(ShouldSetupDtlsSrtp_n() && srtp_filter_.IsActive()))
         << "Setting RTCP for DTLS/SRTP after SrtpFilter is active "
@@ skipping 124 matching lines @@
   RTC_DCHECK(network_thread_->IsCurrent());
   if (!rtp_dtls_transport_) {
     return false;
   }
   return rtp_dtls_transport_->ice_transport()->GetStats(infos);
 }
 
 bool BaseChannel::NeedsRtcpTransport() {
   // If this BaseChannel doesn't require RTCP mux and we haven't fully
   // negotiated RTCP mux, we need an RTCP transport.
-  return !rtcp_mux_required_ && !rtcp_mux_filter_.IsFullyActive();
+  return !rtp_transport_.rtcp_mux_required() &&
+         !rtcp_mux_filter_.IsFullyActive();
 }
 
 bool BaseChannel::IsReadyToReceiveMedia_w() const {
   // Receive data if we are enabled and have local content,
   return enabled() && IsReceiveContentDirection(local_content_direction_);
 }
 
 bool BaseChannel::IsReadyToSendMedia_w() const {
   // Need to access some state updated on the network thread.
   return network_thread_->Invoke<bool>(
@@ skipping 25 matching lines @@
       RTC_FROM_HERE, Bind(&BaseChannel::SetOption_n, this, type, opt, value));
 }
 
 int BaseChannel::SetOption_n(SocketType type,
                              rtc::Socket::Option opt,
                              int value) {
   RTC_DCHECK(network_thread_->IsCurrent());
   rtc::PacketTransportInternal* transport = nullptr;
   switch (type) {
     case ST_RTP:
-      transport = rtp_packet_transport_;
+      transport = rtp_transport_.rtp_packet_transport();
       socket_options_.push_back(
           std::pair<rtc::Socket::Option, int>(opt, value));
       break;
     case ST_RTCP:
-      transport = rtcp_packet_transport_;
+      transport = rtp_transport_.rtcp_packet_transport();
       rtcp_socket_options_.push_back(
           std::pair<rtc::Socket::Option, int>(opt, value));
       break;
   }
   return transport ? transport->SetOption(opt, value) : -1;
 }
 
 bool BaseChannel::SetCryptoOptions(const rtc::CryptoOptions& crypto_options) {
   crypto_options_ = crypto_options;
   return true;
 }
 
 void BaseChannel::OnWritableState(rtc::PacketTransportInternal* transport) {
-  RTC_DCHECK(transport == rtp_packet_transport_ ||
-             transport == rtcp_packet_transport_);
+  RTC_DCHECK(transport == rtp_transport_.rtp_packet_transport() ||
+             transport == rtp_transport_.rtcp_packet_transport());
   RTC_DCHECK(network_thread_->IsCurrent());
   UpdateWritableState_n();
 }
 
 void BaseChannel::OnPacketRead(rtc::PacketTransportInternal* transport,
                                const char* data,
                                size_t len,
                                const rtc::PacketTime& packet_time,
                                int flags) {
   TRACE_EVENT0("webrtc", "BaseChannel::OnPacketRead");
   // OnPacketRead gets called from P2PSocket; now pass data to MediaEngine
   RTC_DCHECK(network_thread_->IsCurrent());
 
   // When using RTCP multiplexing we might get RTCP packets on the RTP
   // transport. We feed RTP traffic into the demuxer to determine if it is RTCP.
   bool rtcp = PacketIsRtcp(transport, data, len);
   rtc::CopyOnWriteBuffer packet(data, len);
   HandlePacket(rtcp, &packet, packet_time);
 }
 
 void BaseChannel::OnReadyToSend(rtc::PacketTransportInternal* transport) {
-  RTC_DCHECK(transport == rtp_packet_transport_ ||
-             transport == rtcp_packet_transport_);
-  SetTransportChannelReadyToSend(transport == rtcp_packet_transport_, true);
+  RTC_DCHECK(transport == rtp_transport_.rtp_packet_transport() ||
+             transport == rtp_transport_.rtcp_packet_transport());
+  SetTransportChannelReadyToSend(
+      transport == rtp_transport_.rtcp_packet_transport(), true);
 }
 
 void BaseChannel::OnDtlsState(DtlsTransportInternal* transport,
                               DtlsTransportState state) {
   if (!ShouldSetupDtlsSrtp_n()) {
     return;
   }
 
   // Reset the srtp filter if it's not the CONNECTED state. For the CONNECTED
   // state, setting up DTLS-SRTP context is deferred to ChannelWritable_w to
@@ skipping 36 matching lines @@
   RTC_DCHECK(network_thread_->IsCurrent());
   if (rtcp) {
     rtcp_ready_to_send_ = ready;
   } else {
     rtp_ready_to_send_ = ready;
   }
 
   bool ready_to_send =
       (rtp_ready_to_send_ &&
        // In the case of rtcp mux |rtcp_packet_transport_| will be null.
-       (rtcp_ready_to_send_ || !rtcp_packet_transport_));
+       (rtcp_ready_to_send_ || !rtp_transport_.rtcp_packet_transport()));
 
   invoker_.AsyncInvoke<void>(
       RTC_FROM_HERE, worker_thread_,
       Bind(&MediaChannel::OnReadyToSend, media_channel_, ready_to_send));
 }
 
 bool BaseChannel::PacketIsRtcp(const rtc::PacketTransportInternal* transport,
                                const char* data,
                                size_t len) {
-  return (transport == rtcp_packet_transport_ ||
+  return (transport == rtp_transport_.rtcp_packet_transport() ||
           rtcp_mux_filter_.DemuxRtcp(data, static_cast<int>(len)));
 }
 
 bool BaseChannel::SendPacket(bool rtcp,
                              rtc::CopyOnWriteBuffer* packet,
                              const rtc::PacketOptions& options) {
   // SendPacket gets called from MediaEngine, on a pacer or an encoder thread.
   // If the thread is not our network thread, we will post to our network
   // so that the real work happens on our network. This avoids us having to
   // synchronize access to all the pieces of the send path, including
   // SRTP and the inner workings of the transport channels.
   // The only downside is that we can't return a proper failure code if
   // needed. Since UDP is unreliable anyway, this should be a non-issue.
   if (!network_thread_->IsCurrent()) {
     // Avoid a copy by transferring the ownership of the packet data.
     int message_id = rtcp ? MSG_SEND_RTCP_PACKET : MSG_SEND_RTP_PACKET;
     SendPacketMessageData* data = new SendPacketMessageData;
     data->packet = std::move(*packet);
     data->options = options;
     network_thread_->Post(RTC_FROM_HERE, this, message_id, data);
     return true;
   }
   TRACE_EVENT0("webrtc", "BaseChannel::SendPacket");
 
   // Now that we are on the correct thread, ensure we have a place to send this
   // packet before doing anything. (We might get RTCP packets that we don't
   // intend to send.) If we've negotiated RTCP mux, send RTCP over the RTP
   // transport.
   rtc::PacketTransportInternal* transport =
-      (!rtcp || rtcp_mux_filter_.IsActive()) ? rtp_packet_transport_
-                                             : rtcp_packet_transport_;
+      (!rtcp || rtcp_mux_filter_.IsActive())
+          ? rtp_transport_.rtp_packet_transport()
+          : rtp_transport_.rtcp_packet_transport();
   if (!transport || !transport->writable()) {
     return false;
   }
 
   // Protect ourselves against crazy data.
   if (!ValidPacket(rtcp, packet)) {
     LOG(LS_ERROR) << "Dropping outgoing " << content_name_ << " "
                   << PacketType(rtcp)
                   << " packet: wrong size=" << packet->size();
     return false;
@@ skipping 233 matching lines @@
   RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
   if (!enabled_)
     return;
 
   LOG(LS_INFO) << "Channel disabled";
   enabled_ = false;
   UpdateMediaSendRecvState_w();
 }
 
 void BaseChannel::UpdateWritableState_n() {
-  if (rtp_packet_transport_ && rtp_packet_transport_->writable() &&
-      (!rtcp_packet_transport_ || rtcp_packet_transport_->writable())) {
+  rtc::PacketTransportInternal* rtp_packet_transport =
+      rtp_transport_.rtp_packet_transport();
+  rtc::PacketTransportInternal* rtcp_packet_transport =
+      rtp_transport_.rtcp_packet_transport();
+  if (rtp_packet_transport && rtp_packet_transport->writable() &&
+      (!rtcp_packet_transport || rtcp_packet_transport->writable())) {
     ChannelWritable_n();
   } else {
     ChannelNotWritable_n();
   }
 }
 
 void BaseChannel::ChannelWritable_n() {
   RTC_DCHECK(network_thread_->IsCurrent());
   if (writable_) {
     return;
@@ skipping 258 matching lines @@
   }
   return true;
 }
 
 bool BaseChannel::SetRtcpMux_n(bool enable,
                                ContentAction action,
                                ContentSource src,
                                std::string* error_desc) {
   // Provide a more specific error message for the RTCP mux "require" policy
   // case.
-  if (rtcp_mux_required_ && !enable) {
+  if (rtp_transport_.rtcp_mux_required() && !enable) {
     SafeSetError(
         "rtcpMuxPolicy is 'require', but media description does not "
         "contain 'a=rtcp-mux'.",
         error_desc);
     return false;
   }
   bool ret = false;
   switch (action) {
     case CA_OFFER:
       ret = rtcp_mux_filter_.SetOffer(enable, src);
       break;
     case CA_PRANSWER:
       // This may activate RTCP muxing, but we don't yet destroy the transport
       // because the final answer may deactivate it.
       ret = rtcp_mux_filter_.SetProvisionalAnswer(enable, src);
       break;
     case CA_ANSWER:
       ret = rtcp_mux_filter_.SetAnswer(enable, src);
       if (ret && rtcp_mux_filter_.IsActive()) {
         // We permanently activated RTCP muxing; signal that we no longer need
         // the RTCP transport.
-        std::string debug_name = transport_name_.empty()
-                                     ? rtp_packet_transport_->debug_name()
-                                     : transport_name_;
+        std::string debug_name =
+            transport_name_.empty()
+                ? rtp_transport_.rtp_packet_transport()->debug_name()
+                : transport_name_;
         ;
         LOG(LS_INFO) << "Enabling rtcp-mux for " << content_name()
                      << "; no longer need RTCP transport for " << debug_name;
-        if (rtcp_packet_transport_) {
+        if (rtp_transport_.rtcp_packet_transport()) {
           SetTransport_n(true, nullptr, nullptr);
           SignalRtcpMuxFullyActive(transport_name_);
         }
         UpdateWritableState_n();
         SetTransportChannelReadyToSend(true, false);
       }
       break;
     case CA_UPDATE:
       // No RTCP mux info.
       ret = true;
       break;
     default:
       break;
   }
   if (!ret) {
     SafeSetError("Failed to setup RTCP mux filter.", error_desc);
     return false;
   }
   // |rtcp_mux_filter_| can be active if |action| is CA_PRANSWER or
   // CA_ANSWER, but we only want to tear down the RTCP transport if we received
   // a final answer.
   if (rtcp_mux_filter_.IsActive()) {
     // If the RTP transport is already writable, then so are we.
-    if (rtp_packet_transport_->writable()) {
+    if (rtp_transport_.rtp_packet_transport()->writable()) {
       ChannelWritable_n();
     }
   }
 
   return true;
 }
 
 bool BaseChannel::AddRecvStream_w(const StreamParams& sp) {
   RTC_DCHECK(worker_thread() == rtc::Thread::Current());
   return media_channel()->AddRecvStream(sp);
@@ skipping 1153 matching lines @@
   signaling_thread()->Post(RTC_FROM_HERE, this, MSG_READYTOSENDDATA,
                            new DataChannelReadyToSendMessageData(writable));
 }
 
 void RtpDataChannel::GetSrtpCryptoSuites_n(
     std::vector<int>* crypto_suites) const {
   GetSupportedDataCryptoSuites(crypto_options(), crypto_suites);
 }
 
 }  // namespace cricket