Revert of make the DtlsTransportWrapper inherit form DtlsTransportInternal

webrtc/pc/channel.h

 /*
  *  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 68 matching lines @@
   // If |srtp_required| is true, the channel will not send or receive any
   // RTP/RTCP packets without using SRTP (either using SDES or DTLS-SRTP).
   BaseChannel(rtc::Thread* worker_thread,
               rtc::Thread* network_thread,
               rtc::Thread* signaling_thread,
               MediaChannel* channel,
               const std::string& content_name,
               bool rtcp_mux_required,
               bool srtp_required);
   virtual ~BaseChannel();
-  bool Init_w(DtlsTransportInternal* rtp_dtls_transport,
-              DtlsTransportInternal* rtcp_dtls_transport);
+  bool Init_w(TransportChannel* rtp_transport,
+              TransportChannel* rtcp_transport);
   // Deinit may be called multiple times and is simply ignored if it's already
   // done.
   void Deinit();
 
   rtc::Thread* worker_thread() const { return worker_thread_; }
   rtc::Thread* network_thread() const { return network_thread_; }
   const std::string& content_name() const { return content_name_; }
   const std::string& transport_name() const { return transport_name_; }
   bool enabled() const { return enabled_; }
 
   // This function returns true if we are using SRTP.
   bool secure() const { return srtp_filter_.IsActive(); }
   // The following function returns true if we are using
   // DTLS-based keying. If you turned off SRTP later, however
   // you could have secure() == false and dtls_secure() == true.
   bool secure_dtls() const { return dtls_keyed_; }
 
   bool writable() const { return writable_; }
 
   // Set the transport(s), and update writability and "ready-to-send" state.
   // |rtp_transport| must be non-null.
   // |rtcp_transport| must be supplied if NeedsRtcpTransport() is true (meaning
   // RTCP muxing is not fully active yet).
   // |rtp_transport| and |rtcp_transport| must share the same transport name as
   // well.
-  void SetTransports(DtlsTransportInternal* rtp_dtls_transport,
-                     DtlsTransportInternal* rtcp_dtls_transport);
+  void SetTransports(TransportChannel* rtp_transport,
+                     TransportChannel* rtcp_transport);
   bool PushdownLocalDescription(const SessionDescription* local_desc,
                                 ContentAction action,
                                 std::string* error_desc);
   bool PushdownRemoteDescription(const SessionDescription* remote_desc,
                                 ContentAction action,
                                 std::string* error_desc);
   // Channel control
   bool SetLocalContent(const MediaContentDescription* content,
                        ContentAction action,
                        std::string* error_desc);
@@ skipping 24 matching lines @@
     return remote_streams_;
   }
 
   sigslot::signal2<BaseChannel*, bool> SignalDtlsSrtpSetupFailure;
   void SignalDtlsSrtpSetupFailure_n(bool rtcp);
   void SignalDtlsSrtpSetupFailure_s(bool rtcp);
 
   // Used for latency measurements.
   sigslot::signal1<BaseChannel*> SignalFirstPacketReceived;
 
-  // Forward SignalSentPacket to worker thread.
+  // Forward TransportChannel SignalSentPacket to worker thread.
   sigslot::signal1<const rtc::SentPacket&> SignalSentPacket;
 
   // Emitted whenever rtcp-mux is fully negotiated and the rtcp-transport can
   // be destroyed.
   // Fired on the network thread.
   sigslot::signal1<const std::string&> SignalRtcpMuxFullyActive;
 
-  // Only public for unit tests.  Otherwise, consider private.
-  DtlsTransportInternal* rtp_dtls_transport() const {
-    return rtp_dtls_transport_;
-  }
-  DtlsTransportInternal* rtcp_dtls_transport() const {
-    return rtcp_dtls_transport_;
-  }
+  TransportChannel* rtp_transport() const { return rtp_transport_; }
+  TransportChannel* rtcp_transport() const { return rtcp_transport_; }
 
   bool NeedsRtcpTransport();
 
   // Made public for easier testing.
   //
   // Updates "ready to send" for an individual channel, and informs the media
   // channel that the transport is ready to send if each channel (in use) is
   // ready to send. This is more specific than just "writable"; it means the
   // last send didn't return ENOTCONN.
   //
@@ skipping 11 matching lines @@
   virtual cricket::MediaType media_type() = 0;
 
   bool SetCryptoOptions(const rtc::CryptoOptions& crypto_options);
 
   // This function returns true if we require SRTP for call setup.
   bool srtp_required_for_testing() const { return srtp_required_; }
 
  protected:
   virtual MediaChannel* media_channel() const { return media_channel_; }
 
-  void SetTransports_n(DtlsTransportInternal* rtp_dtls_transport,
-                       DtlsTransportInternal* rtcp_dtls_transport);
+  void SetTransports_n(TransportChannel* rtp_transport,
+                       TransportChannel* rtcp_transport);
 
   // This does not update writability or "ready-to-send" state; it just
   // disconnects from the old channel and connects to the new one.
-  void SetTransport_n(bool rtcp, DtlsTransportInternal* new_transport);
+  void SetTransportChannel_n(bool rtcp, TransportChannel* new_transport);
 
   bool was_ever_writable() const { return was_ever_writable_; }
   void set_local_content_direction(MediaContentDirection direction) {
     local_content_direction_ = direction;
   }
   void set_remote_content_direction(MediaContentDirection direction) {
     remote_content_direction_ = direction;
   }
   // These methods verify that:
   // * The required content description directions have been set.
   // * The channel is enabled.
   // * And for sending:
   //   - The SRTP filter is active if it's needed.
   //   - The transport has been writable before, meaning it should be at least
   //     possible to succeed in sending a packet.
   //
   // When any of these properties change, UpdateMediaSendRecvState_w should be
   // called.
   bool IsReadyToReceiveMedia_w() const;
   bool IsReadyToSendMedia_w() const;
   rtc::Thread* signaling_thread() { return signaling_thread_; }
 
-  void ConnectToTransport(DtlsTransportInternal* transport);
-  void DisconnectFromTransport(DtlsTransportInternal* transport);
+  void ConnectToTransportChannel(TransportChannel* tc);
+  void DisconnectFromTransportChannel(TransportChannel* tc);
 
   void FlushRtcpMessages_n();
 
   // NetworkInterface implementation, called by MediaEngine
   bool SendPacket(rtc::CopyOnWriteBuffer* packet,
                   const rtc::PacketOptions& options) override;
   bool SendRtcp(rtc::CopyOnWriteBuffer* packet,
                 const rtc::PacketOptions& options) override;
 
   // From TransportChannel
   void OnWritableState(rtc::PacketTransportInterface* transport);
   virtual void OnPacketRead(rtc::PacketTransportInterface* transport,
                             const char* data,
                             size_t len,
                             const rtc::PacketTime& packet_time,
                             int flags);
   void OnReadyToSend(rtc::PacketTransportInterface* transport);
 
-  void OnDtlsState(DtlsTransportInternal* transport, DtlsTransportState state);
+  void OnDtlsState(TransportChannel* channel, DtlsTransportState state);
 
   void OnSelectedCandidatePairChanged(
-      IceTransportInternal* ice_transport,
+      TransportChannel* channel,
       CandidatePairInterface* selected_candidate_pair,
       int last_sent_packet_id,
       bool ready_to_send);
 
   bool PacketIsRtcp(const rtc::PacketTransportInterface* transport,
                     const char* data,
                     size_t len);
   bool SendPacket(bool rtcp,
                   rtc::CopyOnWriteBuffer* packet,
                   const rtc::PacketOptions& options);
@@ skipping 15 matching lines @@
   void ChannelWritable_n();
   void ChannelNotWritable_n();
 
   bool AddRecvStream_w(const StreamParams& sp);
   bool RemoveRecvStream_w(uint32_t ssrc);
   bool AddSendStream_w(const StreamParams& sp);
   bool RemoveSendStream_w(uint32_t ssrc);
   bool ShouldSetupDtlsSrtp_n() const;
   // Do the DTLS key expansion and impose it on the SRTP/SRTCP filters.
   // |rtcp_channel| indicates whether to set up the RTP or RTCP filter.
-  bool SetupDtlsSrtp_n(bool rtcp);
+  bool SetupDtlsSrtp_n(bool rtcp_channel);
   void MaybeSetupDtlsSrtp_n();
   // Set the DTLS-SRTP cipher policy on this channel as appropriate.
-  bool SetDtlsSrtpCryptoSuites_n(DtlsTransportInternal* transport, bool rtcp);
+  bool SetDtlsSrtpCryptoSuites_n(TransportChannel* tc, bool rtcp);
 
   // Should be called whenever the conditions for
   // IsReadyToReceiveMedia/IsReadyToSendMedia are satisfied (or unsatisfied).
   // Updates the send/recv state of the media channel.
   void UpdateMediaSendRecvState();
   virtual void UpdateMediaSendRecvState_w() = 0;
 
   // Gets the content info appropriate to the channel (audio or video).
   virtual const ContentInfo* GetFirstContent(
       const SessionDescription* sdesc) = 0;
@@ skipping 49 matching lines @@
       const std::vector<ConnectionInfo>& infos) = 0;
 
   // Helper function for invoking bool-returning methods on the worker thread.
   template <class FunctorT>
   bool InvokeOnWorker(const rtc::Location& posted_from,
                       const FunctorT& functor) {
     return worker_thread_->Invoke<bool>(posted_from, functor);
   }
 
  private:
-  bool InitNetwork_n(DtlsTransportInternal* rtp_dtls_transport,
-                     DtlsTransportInternal* rtcp_dtls_transport);
+  bool InitNetwork_n(TransportChannel* rtp_transport,
+                     TransportChannel* rtcp_transport);
   void DisconnectTransportChannels_n();
   void SignalSentPacket_n(rtc::PacketTransportInterface* transport,
                           const rtc::SentPacket& sent_packet);
   void SignalSentPacket_w(const rtc::SentPacket& sent_packet);
   bool IsReadyToSendMedia_n() const;
   void CacheRtpAbsSendTimeHeaderExtension_n(int rtp_abs_sendtime_extn_id);
   int GetTransportOverheadPerPacket() const;
   void UpdateTransportOverhead();
 
   rtc::Thread* const worker_thread_;
   rtc::Thread* const network_thread_;
   rtc::Thread* const signaling_thread_;
   rtc::AsyncInvoker invoker_;
 
   const std::string content_name_;
   std::unique_ptr<ConnectionMonitor> connection_monitor_;
 
   std::string transport_name_;
   // True if RTCP-multiplexing is required. In other words, no standalone RTCP
   // transport will ever be used for this channel.
   const bool rtcp_mux_required_;
-
-  DtlsTransportInternal* rtp_dtls_transport_ = nullptr;
+  // TODO(johan): Replace TransportChannel* with rtc::PacketTransportInterface*.
+  TransportChannel* rtp_transport_ = nullptr;
   std::vector<std::pair<rtc::Socket::Option, int> > socket_options_;
-  DtlsTransportInternal* rtcp_dtls_transport_ = nullptr;
+  TransportChannel* rtcp_transport_ = nullptr;
   std::vector<std::pair<rtc::Socket::Option, int> > rtcp_socket_options_;
   SrtpFilter srtp_filter_;
   RtcpMuxFilter rtcp_mux_filter_;
   BundleFilter bundle_filter_;
   bool rtp_ready_to_send_ = false;
   bool rtcp_ready_to_send_ = false;
   bool writable_ = false;
   bool was_ever_writable_ = false;
   bool has_received_packet_ = false;
   bool dtls_keyed_ = false;
@@ skipping 21 matching lines @@
  public:
   VoiceChannel(rtc::Thread* worker_thread,
                rtc::Thread* network_thread,
                rtc::Thread* signaling_thread,
                MediaEngineInterface* media_engine,
                VoiceMediaChannel* channel,
                const std::string& content_name,
                bool rtcp_mux_required,
                bool srtp_required);
   ~VoiceChannel();
-  bool Init_w(DtlsTransportInternal* rtp_dtls_transport,
-              DtlsTransportInternal* rtcp_dtls_transport);
+  bool Init_w(TransportChannel* rtp_transport,
+              TransportChannel* rtcp_transport);
 
   // Configure sending media on the stream with SSRC |ssrc|
   // If there is only one sending stream SSRC 0 can be used.
   bool SetAudioSend(uint32_t ssrc,
                     bool enable,
                     const AudioOptions* options,
                     AudioSource* source);
 
   // downcasts a MediaChannel
   VoiceMediaChannel* media_channel() const override {
@@ skipping 97 matching lines @@
 class VideoChannel : public BaseChannel {
  public:
   VideoChannel(rtc::Thread* worker_thread,
                rtc::Thread* network_thread,
                rtc::Thread* signaling_thread,
                VideoMediaChannel* channel,
                const std::string& content_name,
                bool rtcp_mux_required,
                bool srtp_required);
   ~VideoChannel();
-  bool Init_w(DtlsTransportInternal* rtp_dtls_transport,
-              DtlsTransportInternal* rtcp_dtls_transport);
+  bool Init_w(TransportChannel* rtp_transport,
+              TransportChannel* rtcp_transport);
 
   // downcasts a MediaChannel
   VideoMediaChannel* media_channel() const override {
     return static_cast<VideoMediaChannel*>(BaseChannel::media_channel());
   }
 
   bool SetSink(uint32_t ssrc,
                rtc::VideoSinkInterface<webrtc::VideoFrame>* sink);
   // Get statistics about the current media session.
   bool GetStats(VideoMediaInfo* stats);
@@ skipping 58 matching lines @@
 class RtpDataChannel : public BaseChannel {
  public:
   RtpDataChannel(rtc::Thread* worker_thread,
                  rtc::Thread* network_thread,
                  rtc::Thread* signaling_thread,
                  DataMediaChannel* channel,
                  const std::string& content_name,
                  bool rtcp_mux_required,
                  bool srtp_required);
   ~RtpDataChannel();
-  bool Init_w(DtlsTransportInternal* rtp_dtls_transport,
-              DtlsTransportInternal* rtcp_dtls_transport);
+  bool Init_w(TransportChannel* rtp_transport,
+              TransportChannel* rtcp_transport);
 
   virtual bool SendData(const SendDataParams& params,
                         const rtc::CopyOnWriteBuffer& payload,
                         SendDataResult* result);
 
   void StartMediaMonitor(int cms);
   void StopMediaMonitor();
 
   // Should be called on the signaling thread only.
   bool ready_to_send_data() const {
@@ skipping 82 matching lines @@
   // SetSendParameters.
   DataSendParameters last_send_params_;
   // Last DataRecvParameters sent down to the media_channel() via
   // SetRecvParameters.
   DataRecvParameters last_recv_params_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_PC_CHANNEL_H_